Merge remote-tracking branch 'upstream/pull/4297'

[rails.git] / config / initializers / oauth.rb

diff --git a/config/initializers/oauth.rb b/config/initializers/oauth.rb
index 9179e431f9558d7483e9980311a150c0451e8855..57b89564ffc239bef207abf47fe0abadfe9d51b0 100644 (file)
--- a/config/initializers/oauth.rb
+++ b/config/initializers/oauth.rb
@@ -16,7 +16,7 @@ module OAuth
 
     def unescape(value)
       value.to_s.gsub(/%\h{2}/) do |c|
 
     def unescape(value)
       value.to_s.gsub(/%\h{2}/) do |c|

-        c[1..-1].to_i(16).chr
+        c[1..].to_i(16).chr

       end.force_encoding(Encoding::UTF_8)
     end
   end
       end.force_encoding(Encoding::UTF_8)
     end
   end


@@ -52,12 +52,12 @@ module OpenStreetMap
     module ClassMethods
       def included(controller)
         controller.class_eval do
     module ClassMethods
       def included(controller)
         controller.class_eval do

-          def self.before_filter(*names, &blk)
-            before_action(*names, &blk)
+          def self.before_filter(...)
+            before_action(...)

           end
 
           end
 

-          def self.skip_before_filter(*names, &blk)
-            skip_before_action(*names, &blk)
+          def self.skip_before_filter(...)
+            skip_before_action(...)

           end
         end
 
           end
         end