aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2019-04-20 13:55:05 +0900
committerGitHub <noreply@github.com>2019-04-20 13:55:05 +0900
commit96cf7e0e676c54cb8177de146efa27ed49c4b8c6 (patch)
tree97b2df54b901d25e3886c80c482330525cafe6be /actionpack/lib
parentd3dc651a819d95f0467b0bdad6bc85080debcc43 (diff)
parent1f9c2897a7dc2be7cc4b8593416080912bd13a5a (diff)
downloadrails-96cf7e0e676c54cb8177de146efa27ed49c4b8c6.tar.gz
rails-96cf7e0e676c54cb8177de146efa27ed49c4b8c6.tar.bz2
rails-96cf7e0e676c54cb8177de146efa27ed49c4b8c6.zip
Merge pull request #36041 from abhaynikam/change-deprecation-for-dynamic-route-segment-to-6.1
Change the deprecation message for dynamic routes segment to 6.1
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/routing/route_set.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 4a24c35efb..bbb5762b3c 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -591,14 +591,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 6.0.
+ will be removed in Rails 6.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 6.0.
+ will be removed in Rails 6.1.
MSG
end