From 17c4c2e3e020563203afe199bd73eb1d0dc27496 Mon Sep 17 00:00:00 2001
From: Anders Hassis <anders@spartasales.com>
Date: Wed, 20 Jan 2016 19:30:28 +0100
Subject: [PATCH 01/26] Remove hideactions

---
 lib/rocket_pants/base.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/rocket_pants/base.rb b/lib/rocket_pants/base.rb
index f64784d..d18618c 100644
--- a/lib/rocket_pants/base.rb
+++ b/lib/rocket_pants/base.rb
@@ -15,7 +15,6 @@ class Base < ActionController::Metal
     end
 
     MODULES = [
-      ActionController::HideActions,
       ActionController::UrlFor,
       ActionController::Redirecting,
       ActionController::ConditionalGet,

From 3a547b252dac6060a2e1ef2145c943ebf04fdc29 Mon Sep 17 00:00:00 2001
From: Anders Hassis <anders@spartasales.com>
Date: Wed, 20 Jan 2016 19:33:22 +0100
Subject: [PATCH 02/26] Remove rackdelegation

---
 lib/rocket_pants/base.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/rocket_pants/base.rb b/lib/rocket_pants/base.rb
index d18618c..f5becdc 100644
--- a/lib/rocket_pants/base.rb
+++ b/lib/rocket_pants/base.rb
@@ -18,7 +18,6 @@ class Base < ActionController::Metal
       ActionController::UrlFor,
       ActionController::Redirecting,
       ActionController::ConditionalGet,
-      ActionController::RackDelegation,
       record_identifier_klass,
       ActionController::HttpAuthentication::Basic::ControllerMethods,
       ActionController::HttpAuthentication::Digest::ControllerMethods,

From c386e4785169b94f3d48c0430d065ae0679b9b0a Mon Sep 17 00:00:00 2001
From: Anders Hassis <anders@spartasales.com>
Date: Thu, 21 Jan 2016 11:06:10 +0100
Subject: [PATCH 03/26] Updated path

---
 lib/rocket_pants/railtie.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/rocket_pants/railtie.rb b/lib/rocket_pants/railtie.rb
index 9cb91fa..20ffdeb 100644
--- a/lib/rocket_pants/railtie.rb
+++ b/lib/rocket_pants/railtie.rb
@@ -7,7 +7,7 @@ class Railtie < Rails::Railtie
     config.rocket_pants.pass_through_errors = nil
     config.rocket_pants.pass_through_errors = nil
 
-    config.i18n.railties_load_path << File.expand_path('../locale/en.yml', __FILE__)
+    config.i18n.load_path << File.expand_path('../locale/en.yml', __FILE__)
 
     initializer "rocket_pants.logger" do
       ActiveSupport.on_load(:rocket_pants) { self.logger ||= Rails.logger }
@@ -54,4 +54,4 @@ class Railtie < Rails::Railtie
     end
 
   end
-end
\ No newline at end of file
+end

From d2444f0dea80ab9f869345c65c73feea9f0b30aa Mon Sep 17 00:00:00 2001
From: Anders Hassis <anders@spartasales.com>
Date: Mon, 25 Jan 2016 15:53:15 +0100
Subject: [PATCH 04/26] Change respond type to Mime[:json]

---
 lib/rocket_pants/controller/respondable.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/rocket_pants/controller/respondable.rb b/lib/rocket_pants/controller/respondable.rb
index 6b6476e..9ad21ef 100644
--- a/lib/rocket_pants/controller/respondable.rb
+++ b/lib/rocket_pants/controller/respondable.rb
@@ -123,7 +123,7 @@ def render_json(json, options = {})
       json = encode_to_json(json) unless json.respond_to?(:to_str)
       # Encode the object to json.
       self.status        ||= :ok
-      self.content_type  ||= Mime::JSON
+      self.content_type  ||= Mime[:json]
       self.response_body   = json
       headers['Content-Length'] = Rack::Utils.bytesize(json).to_s
     end
@@ -227,4 +227,4 @@ def metadata_for(object, options, type, singular)
     end
 
   end
-end
\ No newline at end of file
+end

From abb38b1d83b78f1c803b2dbecc55c4f5d0827a4f Mon Sep 17 00:00:00 2001
From: Anders Hassis <anders@spartasales.com>
Date: Fri, 26 Feb 2016 15:05:47 +0100
Subject: [PATCH 05/26] Use String.bytesize instead

---
 lib/rocket_pants/controller/jsonp.rb       | 4 ++--
 lib/rocket_pants/controller/respondable.rb | 2 +-
 spec/rocket_pants/controller_spec.rb       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/rocket_pants/controller/jsonp.rb b/lib/rocket_pants/controller/jsonp.rb
index 0459ca8..fe74cdc 100644
--- a/lib/rocket_pants/controller/jsonp.rb
+++ b/lib/rocket_pants/controller/jsonp.rb
@@ -43,8 +43,8 @@ def wrap_response_in_jsonp
       # Finally, set up the callback using the JSONP parameter.
       response.content_type     = 'application/javascript'
       response.body             = "#{jsonp_parameter}(#{response.body});"
-      headers['Content-Length'] = Rack::Utils.bytesize(response.body).to_s
+      headers['Content-Length'] = (response.body.bytesize).to_s
     end
 
   end
-end
\ No newline at end of file
+end
diff --git a/lib/rocket_pants/controller/respondable.rb b/lib/rocket_pants/controller/respondable.rb
index 9ad21ef..c203a61 100644
--- a/lib/rocket_pants/controller/respondable.rb
+++ b/lib/rocket_pants/controller/respondable.rb
@@ -125,7 +125,7 @@ def render_json(json, options = {})
       self.status        ||= :ok
       self.content_type  ||= Mime[:json]
       self.response_body   = json
-      headers['Content-Length'] = Rack::Utils.bytesize(json).to_s
+      headers['Content-Length'] = (json.bytesize).to_s
     end
 
     # Renders a raw object, without any wrapping etc.
diff --git a/spec/rocket_pants/controller_spec.rb b/spec/rocket_pants/controller_spec.rb
index b6cd677..a15a8f2 100644
--- a/spec/rocket_pants/controller_spec.rb
+++ b/spec/rocket_pants/controller_spec.rb
@@ -410,7 +410,7 @@ def object.serializable_hash(*); {:serialised => true}; end
       get :echo, :echo => "Hello World", :callback => "test"
       response.content_type.should include 'application/javascript'
       response.body.should == %|test({"response":{"echo":"Hello World"}});|
-      response.headers['Content-Length'].to_i.should == Rack::Utils.bytesize(response.body)
+      response.headers['Content-Length'].to_i.should == response.body.bytesize
     end
 
   end
@@ -436,4 +436,4 @@ def object.serializable_hash(*); {:serialised => true}; end
 
   end
 
-end
\ No newline at end of file
+end

From ac04138e3e42fd3767f250f1b05d01d2eab95046 Mon Sep 17 00:00:00 2001
From: Anders Hassis <anders@spartasales.com>
Date: Fri, 26 Feb 2016 15:15:52 +0100
Subject: [PATCH 06/26] Removed deprecated methods

---
 lib/rocket_pants/test_helper.rb | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/lib/rocket_pants/test_helper.rb b/lib/rocket_pants/test_helper.rb
index 1ecb6eb..86ef81f 100644
--- a/lib/rocket_pants/test_helper.rb
+++ b/lib/rocket_pants/test_helper.rb
@@ -7,15 +7,6 @@ module TestHelper
     included do
       require 'action_controller/test_case'
 
-      # Extend the response on first include.
-      class_attribute :_default_version
-      unless ActionController::TestResponse < ResponseHelper
-        ActionController::TestResponse.send :include, ResponseHelper
-      end
-
-      unless ActionDispatch::TestResponse < ResponseHelper
-        ActionDispatch::TestResponse.send :include, ResponseHelper
-      end
     end
 
     module ResponseHelper

From e37a48f9f322d6e3f855e3d570952f850603a412 Mon Sep 17 00:00:00 2001
From: Anders Hassis <anders@spartasales.com>
Date: Fri, 26 Feb 2016 15:24:46 +0100
Subject: [PATCH 07/26] Added back default-version

---
 lib/rocket_pants/test_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/rocket_pants/test_helper.rb b/lib/rocket_pants/test_helper.rb
index 86ef81f..981eaf7 100644
--- a/lib/rocket_pants/test_helper.rb
+++ b/lib/rocket_pants/test_helper.rb
@@ -6,7 +6,7 @@ module TestHelper
 
     included do
       require 'action_controller/test_case'
-
+      class_attribute :_default_version
     end
 
     module ResponseHelper

From 54015c6c901fffa2ad32189672ff9cf1bb7dca2a Mon Sep 17 00:00:00 2001
From: Anders Hassis <anders@spartasales.com>
Date: Fri, 26 Feb 2016 15:28:14 +0100
Subject: [PATCH 08/26] Added back default-version

---
 lib/rocket_pants/test_helper.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/rocket_pants/test_helper.rb b/lib/rocket_pants/test_helper.rb
index 981eaf7..06a2018 100644
--- a/lib/rocket_pants/test_helper.rb
+++ b/lib/rocket_pants/test_helper.rb
@@ -6,7 +6,13 @@ module TestHelper
 
     included do
       require 'action_controller/test_case'
+
+      # Extend the response on first include.
       class_attribute :_default_version
+
+      unless ActionDispatch::TestResponse < ResponseHelper
+        ActionDispatch::TestResponse.send :include, ResponseHelper
+      end
     end
 
     module ResponseHelper

From 08e74df26f018c6b99ca9d82da773e810609a89b Mon Sep 17 00:00:00 2001
From: Anders Hassis <anders@spartasales.com>
Date: Fri, 26 Feb 2016 17:06:49 +0100
Subject: [PATCH 09/26] Use before_action instead

---
 lib/rocket_pants/controller/format_verification.rb | 4 ++--
 lib/rocket_pants/controller/versioning.rb          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/rocket_pants/controller/format_verification.rb b/lib/rocket_pants/controller/format_verification.rb
index 84f50ea..c020d2c 100644
--- a/lib/rocket_pants/controller/format_verification.rb
+++ b/lib/rocket_pants/controller/format_verification.rb
@@ -3,7 +3,7 @@ module FormatVerification
     extend ActiveSupport::Concern
 
     included do
-      before_filter :ensure_has_valid_format
+      before_action :ensure_has_valid_format
     end
 
     private
@@ -13,4 +13,4 @@ def ensure_has_valid_format
     end
 
   end
-end
\ No newline at end of file
+end
diff --git a/lib/rocket_pants/controller/versioning.rb b/lib/rocket_pants/controller/versioning.rb
index 24eeff6..fa5bfb6 100644
--- a/lib/rocket_pants/controller/versioning.rb
+++ b/lib/rocket_pants/controller/versioning.rb
@@ -12,7 +12,7 @@ module ClassMethods
       def version(version)
         version = version..version if version.is_a?(Integer)
         self._version_range = version
-        before_filter :verify_api_version
+        before_action :verify_api_version
       end
 
     end

From a87933747c0fdc3dab0c8e892ca51dffae045642 Mon Sep 17 00:00:00 2001
From: Anders Hassis <anders@spartasales.com>
Date: Tue, 5 Jul 2016 07:07:58 +0200
Subject: [PATCH 10/26] Fixed versions

---
 rocket_pants.gemspec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rocket_pants.gemspec b/rocket_pants.gemspec
index 302529a..e11a9ac 100644
--- a/rocket_pants.gemspec
+++ b/rocket_pants.gemspec
@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   s.description = "Rocket Pants adds JSON API love to Rails and ActionController, making it simpler to build API-oriented controllers."
   s.required_rubygems_version = ">= 1.3.6"
 
-  s.add_dependency 'actionpack', '>= 3.0', '< 5.0'
-  s.add_dependency 'railties',   '>= 3.0', '< 5.0'
+  s.add_dependency 'actionpack', '>= 3.0', '< 6.0'
+  s.add_dependency 'railties',   '>= 3.0', '< 6.0'
   s.add_dependency 'will_paginate', '~> 3.0'
   s.add_dependency 'hashie',        '>= 1.0', '< 3'
   s.add_dependency 'api_smith'
@@ -23,11 +23,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec-rails', '>= 2.4', '< 4.0'
   s.add_development_dependency 'rr',          '~> 1.0'
   s.add_development_dependency 'webmock'
-  s.add_development_dependency 'activerecord', '>= 3.0', '< 5.0'
+  s.add_development_dependency 'activerecord', '>= 3.0', '< 6.0'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'reversible_data', '~> 1.0'
   s.add_development_dependency 'kaminari'
 
   s.files        = Dir.glob("{lib}/**/*")
   s.require_path = 'lib'
-end
\ No newline at end of file
+end

From 6c7e66b182f9ed0cc7537aa6e37852a18ed72573 Mon Sep 17 00:00:00 2001
From: Anders Hassis <anders@spartasales.com>
Date: Thu, 23 Mar 2017 10:02:42 +0100
Subject: [PATCH 11/26] Remove process in test_helper

---
 lib/rocket_pants/test_helper.rb | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/lib/rocket_pants/test_helper.rb b/lib/rocket_pants/test_helper.rb
index 06a2018..a36123d 100644
--- a/lib/rocket_pants/test_helper.rb
+++ b/lib/rocket_pants/test_helper.rb
@@ -85,28 +85,6 @@ def insert_action_controller_testing_into_base
       end
     end
 
-    # Like process, but automatically adds the api version.
-    def process(action, *args)
-
-      insert_action_controller_testing_into_base
-
-      # Rails 4 changes the method signature. In rails 3, parameters is the first argument.
-      # In Rails 4, it's the second.
-      if args.first.is_a?(String)
-        parameters = (args[1] ||= {})
-      else
-        parameters = (args[0] ||= {})
-      end
-
-      response.recycle_cached_body!
-
-      if _default_version.present? && parameters[:version].blank? && parameters['version'].blank?
-        parameters[:version] = _default_version
-      end
-
-      super action, *args
-    end
-
     def normalise_value(value)
       if value.is_a?(Hash)
         value.inject({}) do |acc, (k, v)|

From 8ca13a192bb83536af6d770c300ef6343b1f627a Mon Sep 17 00:00:00 2001
From: Anders Hassis <anders@spartasales.com>
Date: Thu, 23 Mar 2017 10:06:13 +0100
Subject: [PATCH 12/26] Only remove magical add of version

---
 lib/rocket_pants/test_helper.rb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/lib/rocket_pants/test_helper.rb b/lib/rocket_pants/test_helper.rb
index a36123d..6ddcf52 100644
--- a/lib/rocket_pants/test_helper.rb
+++ b/lib/rocket_pants/test_helper.rb
@@ -85,6 +85,24 @@ def insert_action_controller_testing_into_base
       end
     end
 
+    # Like process, but automatically adds the api version.
+    def process(action, *args)
+
+      insert_action_controller_testing_into_base
+
+      # Rails 4 changes the method signature. In rails 3, parameters is the first argument.
+      # In Rails 4, it's the second.
+      if args.first.is_a?(String)
+        parameters = (args[1] ||= {})
+      else
+        parameters = (args[0] ||= {})
+      end
+
+      response.recycle_cached_body!
+
+      super action, *args
+    end
+
     def normalise_value(value)
       if value.is_a?(Hash)
         value.inject({}) do |acc, (k, v)|

From ab598beaabb9e9270d644fc1174eedc82d16992e Mon Sep 17 00:00:00 2001
From: Anders Hassis <anders@spartasales.com>
Date: Thu, 23 Mar 2017 10:07:29 +0100
Subject: [PATCH 13/26] Put back version

---
 lib/rocket_pants/test_helper.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/rocket_pants/test_helper.rb b/lib/rocket_pants/test_helper.rb
index 6ddcf52..06a2018 100644
--- a/lib/rocket_pants/test_helper.rb
+++ b/lib/rocket_pants/test_helper.rb
@@ -100,6 +100,10 @@ def process(action, *args)
 
       response.recycle_cached_body!
 
+      if _default_version.present? && parameters[:version].blank? && parameters['version'].blank?
+        parameters[:version] = _default_version
+      end
+
       super action, *args
     end
 

From afdba5a457169e0ee09f8621d80b1aec42f5b643 Mon Sep 17 00:00:00 2001
From: Anders Hassis <anders@spartasales.com>
Date: Thu, 6 Apr 2017 21:09:50 +0200
Subject: [PATCH 14/26] Fixed tests on Rails 5

---
 lib/rocket_pants/test_helper.rb | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/lib/rocket_pants/test_helper.rb b/lib/rocket_pants/test_helper.rb
index 06a2018..06bf963 100644
--- a/lib/rocket_pants/test_helper.rb
+++ b/lib/rocket_pants/test_helper.rb
@@ -87,21 +87,30 @@ def insert_action_controller_testing_into_base
 
     # Like process, but automatically adds the api version.
     def process(action, *args)
-
       insert_action_controller_testing_into_base
 
-      # Rails 4 changes the method signature. In rails 3, parameters is the first argument.
-      # In Rails 4, it's the second.
-      if args.first.is_a?(String)
-        parameters = (args[1] ||= {})
+      if Rails::VERSION::MAJOR <= 4
+        # Rails 4 changes the method signature. In rails 3, parameters is the first argument.
+        # In Rails 4, it's the second.
+        if args.first.is_a?(String)
+          parameters = (args[1] ||= {})
+        else
+          parameters = (args[0] ||= {})
+        end
       else
         parameters = (args[0] ||= {})
       end
 
       response.recycle_cached_body!
 
-      if _default_version.present? && parameters[:version].blank? && parameters['version'].blank?
-        parameters[:version] = _default_version
+      if Rails::VERSION::MAJOR <= 4
+        if _default_version.present? && parameters[:version].blank? && parameters['version'].blank?
+          parameters[:version] = _default_version
+        end
+      else
+        if _default_version.present? && parameters[:params][:version].blank?
+          parameters[:params][:version] = _default_version
+        end
       end
 
       super action, *args

From 4e35acb4a27891f12eb6935555ad3522c61f5b61 Mon Sep 17 00:00:00 2001
From: Anders Hassis <anders@spartasales.com>
Date: Mon, 29 May 2017 11:15:11 +0200
Subject: [PATCH 15/26] Updated hashie dependency

---
 rocket_pants.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rocket_pants.gemspec b/rocket_pants.gemspec
index e11a9ac..edbc764 100644
--- a/rocket_pants.gemspec
+++ b/rocket_pants.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'actionpack', '>= 3.0', '< 6.0'
   s.add_dependency 'railties',   '>= 3.0', '< 6.0'
   s.add_dependency 'will_paginate', '~> 3.0'
-  s.add_dependency 'hashie',        '>= 1.0', '< 3'
+  s.add_dependency 'hashie',        '>= 1.0', '< 4'
   s.add_dependency 'api_smith'
   s.add_dependency 'moneta'
   s.add_development_dependency 'rspec',       '>= 2.4', '< 4.0'

From 0a2011e076c63a4371884ddb7dae25eea4b9d993 Mon Sep 17 00:00:00 2001
From: Mariano Matayoshi <matayoshi.mariano@gmail.com>
Date: Fri, 4 Aug 2017 11:02:08 -0300
Subject: [PATCH 16/26] Support for rails 5.1.0

---
 lib/rocket_pants/railtie.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/rocket_pants/railtie.rb b/lib/rocket_pants/railtie.rb
index 20ffdeb..4b5d669 100644
--- a/lib/rocket_pants/railtie.rb
+++ b/lib/rocket_pants/railtie.rb
@@ -39,7 +39,7 @@ class Railtie < Rails::Railtie
 
     initializer "rocket_pants.setup_caching" do |app|
       if RocketPants.caching_enabled?
-        app.middleware.insert 'Rack::Runtime', RocketPants::CacheMiddleware
+        app.middleware.insert Rack::Runtime, RocketPants::CacheMiddleware
       end
     end
 

From 2f21e06359d7390c290b02667bf20b25081c8228 Mon Sep 17 00:00:00 2001
From: Mariano Matayoshi <matayoshi.mariano@gmail.com>
Date: Fri, 4 Aug 2017 12:09:11 -0300
Subject: [PATCH 17/26] fixup! Support for rails 5.1.0

---
 lib/rocket_pants/railtie.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/rocket_pants/railtie.rb b/lib/rocket_pants/railtie.rb
index 4b5d669..06d5a57 100644
--- a/lib/rocket_pants/railtie.rb
+++ b/lib/rocket_pants/railtie.rb
@@ -39,7 +39,12 @@ class Railtie < Rails::Railtie
 
     initializer "rocket_pants.setup_caching" do |app|
       if RocketPants.caching_enabled?
-        app.middleware.insert Rack::Runtime, RocketPants::CacheMiddleware
+        run_time_middleware = if Rails.version.to_i > 4
+          Rack::Runtime
+        else
+          "Rack::Runtime"
+        end
+        app.middleware.insert run_time_middleware, RocketPants::CacheMiddleware
       end
     end
 

From 8a69c37ab27690e38fecc512c0c12ec90eba5494 Mon Sep 17 00:00:00 2001
From: Mariano Matayoshi <matayoshi.mariano@gmail.com>
Date: Fri, 4 Aug 2017 12:16:07 -0300
Subject: [PATCH 18/26] fixup! Support for rails 5.1.0

---
 lib/rocket_pants/railtie.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/rocket_pants/railtie.rb b/lib/rocket_pants/railtie.rb
index 06d5a57..0fcee75 100644
--- a/lib/rocket_pants/railtie.rb
+++ b/lib/rocket_pants/railtie.rb
@@ -39,7 +39,7 @@ class Railtie < Rails::Railtie
 
     initializer "rocket_pants.setup_caching" do |app|
       if RocketPants.caching_enabled?
-        run_time_middleware = if Rails.version.to_i > 4
+        run_time_middleware = if Rails::VERSION::MAJOR >= 5
           Rack::Runtime
         else
           "Rack::Runtime"

From 17aac59091420598e30778984b2e0268dc7496d7 Mon Sep 17 00:00:00 2001
From: Zhong Zheng <itoxiccn@gmail.com>
Date: Sat, 10 Mar 2018 14:34:17 +1100
Subject: [PATCH 19/26] Add support for Bugsnag version 6

---
 lib/rocket_pants/controller/rescuable.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/rocket_pants/controller/rescuable.rb b/lib/rocket_pants/controller/rescuable.rb
index 1c9d9ac..d04562e 100644
--- a/lib/rocket_pants/controller/rescuable.rb
+++ b/lib/rocket_pants/controller/rescuable.rb
@@ -23,7 +23,13 @@ module Rescuable
         end
       },
       :bugsnag => lambda { |controller, exception, request|
-        controller.send(:notify_bugsnag, exception, request: request)
+        if controller.respond_to?(:notify_bugsnag, true)
+          controller.send(:notify_bugsnag, exception, request: request)
+        else
+          # Bugsnag v6 removed #notify_bugsnag controller method
+          # Use #notify directly
+          Bugsnag.notify(exception)
+        end
       }
     }
 

From f4be7c7c7fbc474810d90c2fa4b50d9184e0bf5d Mon Sep 17 00:00:00 2001
From: Zhong Zheng <itoxiccn@gmail.com>
Date: Sun, 11 Mar 2018 23:59:57 +1100
Subject: [PATCH 20/26] :white_check_mark: Update spec to use Bugsnag class
 method

---
 spec/rocket_pants/controller/error_handling_spec.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spec/rocket_pants/controller/error_handling_spec.rb b/spec/rocket_pants/controller/error_handling_spec.rb
index 9563650..8d23c64 100644
--- a/spec/rocket_pants/controller/error_handling_spec.rb
+++ b/spec/rocket_pants/controller/error_handling_spec.rb
@@ -75,6 +75,9 @@
           before :each do
             controller_class.use_named_exception_notifier :bugsnag
             stub.instance_of(controller_class).notify_bugsnag {}
+            Bugsnag = Class.new do	
+              define_singleton_method(:notify) { |exception| }	
+            end
           end
 
           it 'should send notification when it is the named exception notifier' do

From d3868f921b2677b04f83a092bba9a8f7dc077520 Mon Sep 17 00:00:00 2001
From: Zhong Zheng <itoxiccn@gmail.com>
Date: Mon, 12 Mar 2018 00:21:02 +1100
Subject: [PATCH 21/26] :art: explicitly use old rspec gem

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 93bfc47..fce81fe 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,7 +14,7 @@ if (moneta_version = ENV["MONETA_VERSION"])
   gem 'moneta', moneta_version
 end
 
-gem 'rspec'
+gem 'rspec', '~>3.3.2'
 
 if (wp_version = ENV['WILL_PAGINATE_VERSION'])
   gem 'will_paginate', wp_version

From 0bb2fd0996f49c90f71fb726599539ff2092244e Mon Sep 17 00:00:00 2001
From: Zhong Zheng <itoxiccn@gmail.com>
Date: Mon, 12 Mar 2018 00:27:40 +1100
Subject: [PATCH 22/26] update rspec version

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index fce81fe..f7f97d0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,7 +14,7 @@ if (moneta_version = ENV["MONETA_VERSION"])
   gem 'moneta', moneta_version
 end
 
-gem 'rspec', '~>3.3.2'
+gem 'rspec', '~>3.3.0'
 
 if (wp_version = ENV['WILL_PAGINATE_VERSION'])
   gem 'will_paginate', wp_version

From 1cd446c420887932ac32b18e0c77f7d2486c119d Mon Sep 17 00:00:00 2001
From: Zhong Zheng <itoxiccn@gmail.com>
Date: Mon, 12 Mar 2018 01:01:37 +1100
Subject: [PATCH 23/26] Revert "update rspec version"

This reverts commit 0bb2fd0996f49c90f71fb726599539ff2092244e.
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index f7f97d0..fce81fe 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,7 +14,7 @@ if (moneta_version = ENV["MONETA_VERSION"])
   gem 'moneta', moneta_version
 end
 
-gem 'rspec', '~>3.3.0'
+gem 'rspec', '~>3.3.2'
 
 if (wp_version = ENV['WILL_PAGINATE_VERSION'])
   gem 'will_paginate', wp_version

From 82d76faf85ad50d45bf849d3196a0100dd949ecf Mon Sep 17 00:00:00 2001
From: Zhong Zheng <itoxiccn@gmail.com>
Date: Mon, 12 Mar 2018 01:01:40 +1100
Subject: [PATCH 24/26] Revert ":art: explicitly use old rspec gem"

This reverts commit d3868f921b2677b04f83a092bba9a8f7dc077520.
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index fce81fe..93bfc47 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,7 +14,7 @@ if (moneta_version = ENV["MONETA_VERSION"])
   gem 'moneta', moneta_version
 end
 
-gem 'rspec', '~>3.3.2'
+gem 'rspec'
 
 if (wp_version = ENV['WILL_PAGINATE_VERSION'])
   gem 'will_paginate', wp_version

From 9364c2ffca6de79166f3e717e7fa6d4e55ce2000 Mon Sep 17 00:00:00 2001
From: Anders Hassis <anders.hassis@gmail.com>
Date: Tue, 17 Apr 2018 14:22:19 +0200
Subject: [PATCH 25/26] Added Rails version to testing

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 59d4585..4ab1f34 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,9 @@ env:
   - RAILS_VERSION="~>4.0.0"
   - RAILS_VERSION="~>4.1.0"
   - RAILS_VERSION="~>4.2.0"
+  - RAILS_VERSION="~>5.0.0"
+  - RAILS_VERSION="~>5.1.0"
+  - RAILS_VERSION="~>5.2.0"
   - RAILS_VERSION="" MONETA_VERSION="~> 0.6.0"
   - RAILS_VERSION="" MONETA_VERSION="~> 0.7.0"
 notifications:

From e2ac0bf239bca9edf4781fbc3f936bc7adb16931 Mon Sep 17 00:00:00 2001
From: Anders Hassis <anders.hassis@gmail.com>
Date: Tue, 17 Apr 2018 14:27:00 +0200
Subject: [PATCH 26/26] Bump Ruby versions

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 4ab1f34..a1dfbfd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,9 @@ rvm:
   - "2.0"
   - "2.1"
   - "2.2"
+  - "2.3"
+  - "2.4"
+  - "2.5"
 env:
   - RAILS_VERSION=""
   - RAILS_VERSION="~>3.2.0"