From: Tom Hughes <tom@compton.nu>
Date: Sat, 3 Jun 2017 16:23:44 +0000 (+0100)
Subject: Replace deprecated xxx_filter methods with xxx_action
X-Git-Tag: live~3393
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/38a39352cb389bca9f96eba1d3c58e9f607d636e

Replace deprecated xxx_filter methods with xxx_action
---

diff --git a/lib/classic_pagination/pagination.rb b/lib/classic_pagination/pagination.rb
index f12ff095f..bd495cef1 100644
--- a/lib/classic_pagination/pagination.rb
+++ b/lib/classic_pagination/pagination.rb
@@ -136,7 +136,7 @@ module ActionController
 
     # These methods become class methods on any controller
     module ClassMethods
-      # Creates a +before_filter+ which automatically paginates an Active
+      # Creates a +before_action+ which automatically paginates an Active
       # Record model for all actions in a controller (or certain actions if
       # specified with the <tt>:actions</tt> option).
       #
@@ -147,7 +147,7 @@ module ActionController
       def paginate(collection_id, options = {})
         Pagination.validate_options!(collection_id, options, false)
         module_eval do
-          before_filter :create_paginators_and_retrieve_collections
+          before_action :create_paginators_and_retrieve_collections
           OPTIONS[self] ||= {}
           OPTIONS[self][collection_id] = options
         end
diff --git a/lib/session_persistence.rb b/lib/session_persistence.rb
index d4dd1cc1d..7d42b71e7 100644
--- a/lib/session_persistence.rb
+++ b/lib/session_persistence.rb
@@ -25,7 +25,7 @@ module SessionPersistence
 
     # Install filter when we are included
     def included(controller)
-      controller.after_filter :persist_session
+      controller.after_action :persist_session
     end
   end