mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Revert "Deprecated multi args to http route methods"
Too painful to lose the compact shorthand form!
This reverts commit e848c52535
.
Conflicts:
actionpack/lib/action_dispatch/routing/mapper.rb
This commit is contained in:
parent
33514a173c
commit
b8f2a43ce2
2 changed files with 1 additions and 13 deletions
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue