From 4ab1f07bed704ec91a13798af334f62d85a712a5 Mon Sep 17 00:00:00 2001
From: Max Melentiev <melentievm@gmail.com>
Date: Fri, 11 Dec 2020 21:00:15 +0300
Subject: [PATCH] Add rails 6.1 support

---
 .travis.yml                                            | 8 +-------
 Appraisals                                             | 6 ++----
 gemfiles/rails_61.gemfile                              | 6 ++----
 lib/telegram/bot/updates_controller/instrumentation.rb | 2 +-
 telegram-bot.gemspec                                   | 4 ++--
 5 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b333114..5b15040 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ rvm:
 - 2.6
 - 2.5
 gemfile:
+- gemfiles/rails_61.gemfile
 - gemfiles/rails_60.gemfile
 - gemfiles/rails_52.gemfile
 matrix:
@@ -20,12 +21,5 @@ matrix:
     gemfile: gemfiles/rails_52.gemfile
   - rvm: 2.3
     gemfile: gemfiles/rails_52.gemfile
-  # future rails
-  - rvm: 2.5
-    gemfile: gemfiles/rails_61.gemfile
-  # Allow rails 6.1 to fail while master branch is used
-  allow_failures:
-  - rvm: 2.5
-    gemfile: gemfiles/rails_61.gemfile
 notifications:
   email: false
diff --git a/Appraisals b/Appraisals
index 17da2c1..56a28d5 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,8 +1,6 @@
 appraise 'rails-61' do
-  git 'https://github.com/rails/rails.git' do
-    gem 'actionpack', '~> 6.1.0.alpha'
-    gem 'railties', '~> 6.1.0.alpha'
-  end
+  gem 'actionpack', '~> 6.1.0'
+  gem 'railties', '~> 6.1.0'
 end
 
 appraise 'rails-60' do
diff --git a/gemfiles/rails_61.gemfile b/gemfiles/rails_61.gemfile
index 7fac8b8..4e6c96c 100644
--- a/gemfiles/rails_61.gemfile
+++ b/gemfiles/rails_61.gemfile
@@ -2,10 +2,8 @@
 
 source "https://rubygems.org"
 
-git "https://github.com/rails/rails.git" do
-  gem "actionpack", "~> 6.1.0.alpha"
-  gem "railties", "~> 6.1.0.alpha"
-end
+gem "actionpack", "~> 6.1.0"
+gem "railties", "~> 6.1.0"
 
 group :development do
   gem "appraisal", "~> 2.2"
diff --git a/lib/telegram/bot/updates_controller/instrumentation.rb b/lib/telegram/bot/updates_controller/instrumentation.rb
index 6f84c5f..112a438 100644
--- a/lib/telegram/bot/updates_controller/instrumentation.rb
+++ b/lib/telegram/bot/updates_controller/instrumentation.rb
@@ -49,7 +49,7 @@ module Telegram
         private
 
         # A hook invoked every time a before callback is halted.
-        def halted_callback_hook(filter)
+        def halted_callback_hook(filter, *)
           Instrumentation.instrument(:halted_callback, filter: filter)
         end
 
diff --git a/telegram-bot.gemspec b/telegram-bot.gemspec
index 26251a7..e4c4999 100644
--- a/telegram-bot.gemspec
+++ b/telegram-bot.gemspec
@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '~> 2.0'
 
-  spec.add_dependency 'actionpack', '>= 4.0', '< 6.1'
-  spec.add_dependency 'activesupport', '>= 4.0', '< 6.1'
+  spec.add_dependency 'actionpack', '>= 4.0', '< 6.2'
+  spec.add_dependency 'activesupport', '>= 4.0', '< 6.2'
   spec.add_dependency 'httpclient', '~> 2.7'
 
   spec.add_development_dependency 'bundler', '> 1.16'