Permalink
Browse files

Revert "Deprecated multi args to http route methods"

Too painful to lose the compact shorthand form!

This reverts commit e848c52.

Conflicts:

	actionpack/lib/action_dispatch/routing/mapper.rb
  • Loading branch information...
1 parent 33514a1 commit b8f2a43ce2fa18173d72ca2593b70dcda48dff5f @jeremy jeremy committed Feb 6, 2012
Showing with 1 addition and 13 deletions.
  1. +0 −11 actionpack/lib/action_dispatch/routing/mapper.rb
  2. +1 −2 actionpack/test/dispatch/routing_test.rb
@@ -2,7 +2,6 @@
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 @@ def delete(*args, &block)
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 @@ def self.call(params, request)
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

0 comments on commit b8f2a43

Please sign in to comment.