diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-02-05 23:22:49 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2012-02-05 23:22:49 -0700 |
commit | b8f2a43ce2fa18173d72ca2593b70dcda48dff5f (patch) | |
tree | 6a40f8418474149e4ab5dc789370ef5090448922 /actionpack/lib/action_dispatch/routing | |
parent | 33514a173c5ab59325db8427183f6d46e18cedb1 (diff) | |
download | rails-b8f2a43ce2fa18173d72ca2593b70dcda48dff5f.tar.gz rails-b8f2a43ce2fa18173d72ca2593b70dcda48dff5f.tar.bz2 rails-b8f2a43ce2fa18173d72ca2593b70dcda48dff5f.zip |
Revert "Deprecated multi args to http route methods"
Too painful to lose the compact shorthand form!
This reverts commit e848c52535fa0f9488cdbdb3f1cedc7c7c02d643.
Conflicts:
actionpack/lib/action_dispatch/routing/mapper.rb
Diffstat (limited to 'actionpack/lib/action_dispatch/routing')
-rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 11 |
1 files changed, 0 insertions, 11 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) |