зеркало из
https://github.com/glebtv/telegram-bot.git
synced 2026-09-03 17:55:52 +03:00
Merge branch 'master' into added-chat-join-request-to-payload-types
Этот коммит содержится в:
13
.github/workflows/ci.yml
поставляемый
13
.github/workflows/ci.yml
поставляемый
@@ -18,25 +18,20 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
ruby:
|
ruby:
|
||||||
- '2.5'
|
- '2.7'
|
||||||
- '2.6'
|
|
||||||
gemfile:
|
gemfile:
|
||||||
- gemfiles/rails_61.gemfile
|
- gemfiles/rails_61.gemfile
|
||||||
- gemfiles/rails_60.gemfile
|
- gemfiles/rails_60.gemfile
|
||||||
- gemfiles/rails_52.gemfile
|
- gemfiles/rails_52.gemfile
|
||||||
|
- gemfiles/rails_51.gemfile
|
||||||
include:
|
include:
|
||||||
# ruby 3.x
|
# ruby 3.x
|
||||||
|
- ruby: '3.2'
|
||||||
|
gemfile: gemfiles/rails_71.gemfile
|
||||||
- ruby: '3.0'
|
- ruby: '3.0'
|
||||||
gemfile: gemfiles/rails_61.gemfile
|
gemfile: gemfiles/rails_61.gemfile
|
||||||
- ruby: '3.0'
|
- ruby: '3.0'
|
||||||
gemfile: gemfiles/rails_60.gemfile
|
gemfile: gemfiles/rails_60.gemfile
|
||||||
# old rails
|
|
||||||
- ruby: '2.5'
|
|
||||||
gemfile: gemfiles/rails_51.gemfile
|
|
||||||
- ruby: '2.5'
|
|
||||||
gemfile: gemfiles/rails_50.gemfile
|
|
||||||
- ruby: '2.5'
|
|
||||||
gemfile: gemfiles/rails_42.gemfile
|
|
||||||
env:
|
env:
|
||||||
BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}
|
BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}
|
||||||
steps:
|
steps:
|
||||||
|
|||||||
15
Appraisals
15
Appraisals
@@ -1,3 +1,8 @@
|
|||||||
|
appraise 'rails-71' do
|
||||||
|
gem 'actionpack', '~> 7.1.0'
|
||||||
|
gem 'railties', '~> 7.1.0'
|
||||||
|
end
|
||||||
|
|
||||||
appraise 'rails-70' do
|
appraise 'rails-70' do
|
||||||
gem 'actionpack', '~> 7.0.0'
|
gem 'actionpack', '~> 7.0.0'
|
||||||
gem 'railties', '~> 7.0.0'
|
gem 'railties', '~> 7.0.0'
|
||||||
@@ -22,13 +27,3 @@ appraise 'rails-51' do
|
|||||||
gem 'actionpack', '~> 5.1.0'
|
gem 'actionpack', '~> 5.1.0'
|
||||||
gem 'railties', '~> 5.1.0'
|
gem 'railties', '~> 5.1.0'
|
||||||
end
|
end
|
||||||
|
|
||||||
appraise 'rails-50' do
|
|
||||||
gem 'actionpack', '~> 5.0.0'
|
|
||||||
gem 'railties', '~> 5.0.0'
|
|
||||||
end
|
|
||||||
|
|
||||||
appraise 'rails-42' do
|
|
||||||
gem 'actionpack', '~> 4.2.0'
|
|
||||||
gem 'railties', '~> 4.2.0'
|
|
||||||
end
|
|
||||||
|
|||||||
6
Gemfile
6
Gemfile
@@ -4,13 +4,13 @@ gemspec
|
|||||||
group :development do
|
group :development do
|
||||||
gem 'appraisal', '~> 2.2'
|
gem 'appraisal', '~> 2.2'
|
||||||
|
|
||||||
gem 'pry', '~> 0.13.1'
|
gem 'pry', '~> 0.14.1'
|
||||||
gem 'pry-byebug', '~> 3.9.0'
|
gem 'pry-byebug', '~> 3.10.1'
|
||||||
gem 'sdoc', '~> 2.0.3'
|
gem 'sdoc', '~> 2.0.3'
|
||||||
|
|
||||||
gem 'telegram-bot-types', '~> 0.6.3'
|
gem 'telegram-bot-types', '~> 0.6.3'
|
||||||
|
|
||||||
gem 'rspec', '~> 3.10.0'
|
gem 'rspec', '~> 3.12.0'
|
||||||
gem 'rspec-its', '~> 1.3.0'
|
gem 'rspec-its', '~> 1.3.0'
|
||||||
gem 'rspec-rails', '~> 4.0.2'
|
gem 'rspec-rails', '~> 4.0.2'
|
||||||
|
|
||||||
|
|||||||
@@ -1,21 +0,0 @@
|
|||||||
# This file was generated by Appraisal
|
|
||||||
|
|
||||||
source "https://rubygems.org"
|
|
||||||
|
|
||||||
gem "actionpack", "~> 5.0.0"
|
|
||||||
gem "railties", "~> 5.0.0"
|
|
||||||
|
|
||||||
group :development do
|
|
||||||
gem "appraisal", "~> 2.2"
|
|
||||||
gem "pry", "~> 0.13.1"
|
|
||||||
gem "pry-byebug", "~> 3.9.0"
|
|
||||||
gem "sdoc", "~> 2.0.3"
|
|
||||||
gem "telegram-bot-types", "~> 0.6.3"
|
|
||||||
gem "rspec", "~> 3.10.0"
|
|
||||||
gem "rspec-its", "~> 1.3.0"
|
|
||||||
gem "rspec-rails", "~> 4.0.2"
|
|
||||||
gem "rubocop", "~> 0.52.1"
|
|
||||||
gem "coveralls", "~> 0.8.23", require: false
|
|
||||||
end
|
|
||||||
|
|
||||||
gemspec path: "../"
|
|
||||||
@@ -7,11 +7,11 @@ gem "railties", "~> 5.1.0"
|
|||||||
|
|
||||||
group :development do
|
group :development do
|
||||||
gem "appraisal", "~> 2.2"
|
gem "appraisal", "~> 2.2"
|
||||||
gem "pry", "~> 0.13.1"
|
gem "pry", "~> 0.14.1"
|
||||||
gem "pry-byebug", "~> 3.9.0"
|
gem "pry-byebug", "~> 3.10.1"
|
||||||
gem "sdoc", "~> 2.0.3"
|
gem "sdoc", "~> 2.0.3"
|
||||||
gem "telegram-bot-types", "~> 0.6.3"
|
gem "telegram-bot-types", "~> 0.6.3"
|
||||||
gem "rspec", "~> 3.10.0"
|
gem "rspec", "~> 3.12.0"
|
||||||
gem "rspec-its", "~> 1.3.0"
|
gem "rspec-its", "~> 1.3.0"
|
||||||
gem "rspec-rails", "~> 4.0.2"
|
gem "rspec-rails", "~> 4.0.2"
|
||||||
gem "rubocop", "~> 0.52.1"
|
gem "rubocop", "~> 0.52.1"
|
||||||
|
|||||||
@@ -7,11 +7,11 @@ gem "railties", "~> 5.2.0"
|
|||||||
|
|
||||||
group :development do
|
group :development do
|
||||||
gem "appraisal", "~> 2.2"
|
gem "appraisal", "~> 2.2"
|
||||||
gem "pry", "~> 0.13.1"
|
gem "pry", "~> 0.14.1"
|
||||||
gem "pry-byebug", "~> 3.9.0"
|
gem "pry-byebug", "~> 3.10.1"
|
||||||
gem "sdoc", "~> 2.0.3"
|
gem "sdoc", "~> 2.0.3"
|
||||||
gem "telegram-bot-types", "~> 0.6.3"
|
gem "telegram-bot-types", "~> 0.6.3"
|
||||||
gem "rspec", "~> 3.10.0"
|
gem "rspec", "~> 3.12.0"
|
||||||
gem "rspec-its", "~> 1.3.0"
|
gem "rspec-its", "~> 1.3.0"
|
||||||
gem "rspec-rails", "~> 4.0.2"
|
gem "rspec-rails", "~> 4.0.2"
|
||||||
gem "rubocop", "~> 0.52.1"
|
gem "rubocop", "~> 0.52.1"
|
||||||
|
|||||||
@@ -7,11 +7,11 @@ gem "railties", "~> 6.0.0"
|
|||||||
|
|
||||||
group :development do
|
group :development do
|
||||||
gem "appraisal", "~> 2.2"
|
gem "appraisal", "~> 2.2"
|
||||||
gem "pry", "~> 0.13.1"
|
gem "pry", "~> 0.14.1"
|
||||||
gem "pry-byebug", "~> 3.9.0"
|
gem "pry-byebug", "~> 3.10.1"
|
||||||
gem "sdoc", "~> 2.0.3"
|
gem "sdoc", "~> 2.0.3"
|
||||||
gem "telegram-bot-types", "~> 0.6.3"
|
gem "telegram-bot-types", "~> 0.6.3"
|
||||||
gem "rspec", "~> 3.10.0"
|
gem "rspec", "~> 3.12.0"
|
||||||
gem "rspec-its", "~> 1.3.0"
|
gem "rspec-its", "~> 1.3.0"
|
||||||
gem "rspec-rails", "~> 4.0.2"
|
gem "rspec-rails", "~> 4.0.2"
|
||||||
gem "rubocop", "~> 0.52.1"
|
gem "rubocop", "~> 0.52.1"
|
||||||
|
|||||||
@@ -7,11 +7,11 @@ gem "railties", "~> 6.1.0"
|
|||||||
|
|
||||||
group :development do
|
group :development do
|
||||||
gem "appraisal", "~> 2.2"
|
gem "appraisal", "~> 2.2"
|
||||||
gem "pry", "~> 0.13.1"
|
gem "pry", "~> 0.14.1"
|
||||||
gem "pry-byebug", "~> 3.9.0"
|
gem "pry-byebug", "~> 3.10.1"
|
||||||
gem "sdoc", "~> 2.0.3"
|
gem "sdoc", "~> 2.0.3"
|
||||||
gem "telegram-bot-types", "~> 0.6.3"
|
gem "telegram-bot-types", "~> 0.6.3"
|
||||||
gem "rspec", "~> 3.10.0"
|
gem "rspec", "~> 3.12.0"
|
||||||
gem "rspec-its", "~> 1.3.0"
|
gem "rspec-its", "~> 1.3.0"
|
||||||
gem "rspec-rails", "~> 4.0.2"
|
gem "rspec-rails", "~> 4.0.2"
|
||||||
gem "rubocop", "~> 0.52.1"
|
gem "rubocop", "~> 0.52.1"
|
||||||
|
|||||||
@@ -7,11 +7,11 @@ gem "railties", "~> 7.0.0"
|
|||||||
|
|
||||||
group :development do
|
group :development do
|
||||||
gem "appraisal", "~> 2.2"
|
gem "appraisal", "~> 2.2"
|
||||||
gem "pry", "~> 0.13.1"
|
gem "pry", "~> 0.14.1"
|
||||||
gem "pry-byebug", "~> 3.9.0"
|
gem "pry-byebug", "~> 3.10.1"
|
||||||
gem "sdoc", "~> 2.0.3"
|
gem "sdoc", "~> 2.0.3"
|
||||||
gem "telegram-bot-types", "~> 0.6.3"
|
gem "telegram-bot-types", "~> 0.6.3"
|
||||||
gem "rspec", "~> 3.10.0"
|
gem "rspec", "~> 3.12.0"
|
||||||
gem "rspec-its", "~> 1.3.0"
|
gem "rspec-its", "~> 1.3.0"
|
||||||
gem "rspec-rails", "~> 4.0.2"
|
gem "rspec-rails", "~> 4.0.2"
|
||||||
gem "rubocop", "~> 0.52.1"
|
gem "rubocop", "~> 0.52.1"
|
||||||
|
|||||||
@@ -2,16 +2,16 @@
|
|||||||
|
|
||||||
source "https://rubygems.org"
|
source "https://rubygems.org"
|
||||||
|
|
||||||
gem "actionpack", "~> 4.2.0"
|
gem "actionpack", "~> 7.1.0"
|
||||||
gem "railties", "~> 4.2.0"
|
gem "railties", "~> 7.1.0"
|
||||||
|
|
||||||
group :development do
|
group :development do
|
||||||
gem "appraisal", "~> 2.2"
|
gem "appraisal", "~> 2.2"
|
||||||
gem "pry", "~> 0.13.1"
|
gem "pry", "~> 0.14.1"
|
||||||
gem "pry-byebug", "~> 3.9.0"
|
gem "pry-byebug", "~> 3.10.1"
|
||||||
gem "sdoc", "~> 2.0.3"
|
gem "sdoc", "~> 2.0.3"
|
||||||
gem "telegram-bot-types", "~> 0.6.3"
|
gem "telegram-bot-types", "~> 0.6.3"
|
||||||
gem "rspec", "~> 3.10.0"
|
gem "rspec", "~> 3.12.0"
|
||||||
gem "rspec-its", "~> 1.3.0"
|
gem "rspec-its", "~> 1.3.0"
|
||||||
gem "rspec-rails", "~> 4.0.2"
|
gem "rspec-rails", "~> 4.0.2"
|
||||||
gem "rubocop", "~> 0.52.1"
|
gem "rubocop", "~> 0.52.1"
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
# Generated with bin/fetch-telegram-methods
|
# Generated with bin/fetch-telegram-methods
|
||||||
# Bot API 6.7
|
# Bot API 6.8
|
||||||
|
|
||||||
getUpdates
|
getUpdates
|
||||||
setWebhook
|
setWebhook
|
||||||
@@ -68,6 +68,7 @@ closeGeneralForumTopic
|
|||||||
reopenGeneralForumTopic
|
reopenGeneralForumTopic
|
||||||
hideGeneralForumTopic
|
hideGeneralForumTopic
|
||||||
unhideGeneralForumTopic
|
unhideGeneralForumTopic
|
||||||
|
unpinAllGeneralForumTopicMessages
|
||||||
answerCallbackQuery
|
answerCallbackQuery
|
||||||
setMyCommands
|
setMyCommands
|
||||||
deleteMyCommands
|
deleteMyCommands
|
||||||
|
|||||||
@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
|
|||||||
|
|
||||||
spec.required_ruby_version = '>= 2.4'
|
spec.required_ruby_version = '>= 2.4'
|
||||||
|
|
||||||
spec.add_dependency 'actionpack', '>= 4.0', '< 7.1'
|
spec.add_dependency 'actionpack', '>= 4.0', '< 7.2'
|
||||||
spec.add_dependency 'activesupport', '>= 4.0', '< 7.1'
|
spec.add_dependency 'activesupport', '>= 4.0', '< 7.2'
|
||||||
spec.add_dependency 'httpclient', '~> 2.7'
|
spec.add_dependency 'httpclient', '~> 2.7'
|
||||||
|
|
||||||
spec.add_development_dependency 'bundler', '> 1.16'
|
spec.add_development_dependency 'bundler', '> 1.16'
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user