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

2 files changed, 3 insertions, 3 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
 
diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb
index 238ea92da4..331813f338 100644
--- a/activerecord/lib/active_record/attribute_methods.rb
+++ b/activerecord/lib/active_record/attribute_methods.rb
@@ -197,7 +197,7 @@ module ActiveRecord
             "Dangerous query method (method whose arguments are used as raw " \
             "SQL) called with non-attribute argument(s): " \
             "#{unexpected.map(&:inspect).join(", ")}. Non-attribute " \
-            "arguments will be disallowed in Rails 6.0. This method should " \
+            "arguments will be disallowed in Rails 6.1. This method should " \
             "not be called with user-provided values, such as request " \
             "parameters or model attributes. Known-safe values can be passed " \
             "by wrapping them in Arel.sql()."