diff options
author | Jeremy Daer <jeremydaer@gmail.com> | 2016-04-11 14:31:08 -0700 |
---|---|---|
committer | Jeremy Daer <jeremydaer@gmail.com> | 2016-04-11 14:31:08 -0700 |
commit | 1a5fdf77122e32fc710148ea3e795fedb597ad46 (patch) | |
tree | 66494467e90c156a9e24849f18708b44152e3272 /actionpack/lib/action_dispatch/routing | |
parent | dbb2c2c7b5255eee75868835b0ebd2c36f6ff0cd (diff) | |
parent | ac027338e4a165273607dccee49a3d38bc836794 (diff) | |
download | rails-1a5fdf77122e32fc710148ea3e795fedb597ad46.tar.gz rails-1a5fdf77122e32fc710148ea3e795fedb597ad46.tar.bz2 rails-1a5fdf77122e32fc710148ea3e795fedb597ad46.zip |
Merge pull request #24492 from vipulnsward/pass-over-warnings
Clean up all Rails 5 warnings. Revert auto-added periods.
Diffstat (limited to 'actionpack/lib/action_dispatch/routing')
-rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 2 | ||||
-rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 16b430c36e..5a747b5f17 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -1598,7 +1598,7 @@ module ActionDispatch 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: +Specifying strings for both :path and the route path is deprecated. Change things like this: match #{_path.inspect}, :path => #{option_path.inspect} diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 85f202b823..16237bd564 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -517,14 +517,14 @@ module ActionDispatch if route.segment_keys.include?(:controller) ActiveSupport::Deprecation.warn(<<-MSG.squish) Using a dynamic :controller segment in a route is deprecated and - will be removed in Rails 5.1 + will be removed in Rails 5.1. MSG end if route.segment_keys.include?(:action) ActiveSupport::Deprecation.warn(<<-MSG.squish) Using a dynamic :action segment in a route is deprecated and - will be removed in Rails 5.1 + will be removed in Rails 5.1. MSG end |