aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb11
-rw-r--r--actionpack/test/dispatch/routing_test.rb3
2 files changed, 1 insertions, 13 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index a17a39bed3..b601fcdb3d 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -2,7 +2,6 @@ require 'active_support/core_ext/hash/except'
require 'active_support/core_ext/object/blank'
require 'active_support/core_ext/object/inclusion'
require 'active_support/inflector'
-require 'active_support/deprecation'
require 'action_dispatch/routing/redirection'
module ActionDispatch
@@ -503,16 +502,6 @@ module ActionDispatch
private
def map_method(method, args, &block)
- if args.length > 2
- ActiveSupport::Deprecation.warn <<-eowarn
-The method signature of #{method}() is changing to:
-
- #{method}(path, options = {}, &block)
-
-Calling with multiple paths is deprecated.
- eowarn
- end
-
options = args.extract_options!
options[:via] = method
match(*args, options, &block)
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 93f5419487..b9c0189303 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -157,8 +157,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
end
resources :posts do
- get :archive, :on => :collection
- get :toggle_view, :on => :collection
+ get :archive, :toggle_view, :on => :collection
post :preview, :on => :member
resource :subscription