aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2016-07-28 00:42:33 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2016-10-10 01:36:00 -0300
commit9185b68cc652a113a85e29c8d6f7655f360cbedb (patch)
tree3f9496ad6ef6a392b112aac6d6a0d15d0ebcc3c9 /actionpack/lib/action_dispatch/routing
parent5860b3544c6f02f7d98a7546b463b9fa89f5adf7 (diff)
downloadrails-9185b68cc652a113a85e29c8d6f7655f360cbedb.tar.gz
rails-9185b68cc652a113a85e29c8d6f7655f360cbedb.tar.bz2
rails-9185b68cc652a113a85e29c8d6f7655f360cbedb.zip
Remove deprecated support for passing `:path` and route path as stings in `ActionDispatch::Routing::Mapper#match`
Diffstat (limited to 'actionpack/lib/action_dispatch/routing')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb13
1 files changed, 1 insertions, 12 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 6db5ad8308..c481c190bf 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1840,18 +1840,7 @@ module ActionDispatch
path_types.fetch(String, []).each do |_path|
route_options = options.dup
if _path && option_path
- ActiveSupport::Deprecation.warn <<-eowarn
-Specifying strings for both :path and the route path is deprecated. Change things like this:
-
- match #{_path.inspect}, :path => #{option_path.inspect}
-
-to this:
-
- match #{option_path.inspect}, :as => #{_path.inspect}, :action => #{_path.inspect}
- eowarn
- route_options[:action] = _path
- route_options[:as] = _path
- _path = option_path
+ raise ArgumentError, "Ambigous route definition. Both :path and the route path where specified as strings."
end
to = get_to_from_path(_path, to, route_options[:action])
decomposed_match(_path, controller, route_options, _path, to, via, formatted, anchor, options_constraints)