Merge pull request #29628 from kamipo/fix_next_version_of_rails

Fix the next version of Rails from 5.3 to 6.0
rails · Jun 29, 2017 · 47c74e3 · 47c74e3
2 parents a317af9 + 1d264f0
commit 47c74e3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb
@@ -41,7 +41,7 @@ def count(column_name = nil)
         unless column_name.nil?
           ActiveSupport::Deprecation.warn \
             "When `count' is called with a block, it ignores other arguments. " \
-            "This behavior is now deprecated and will result in an ArgumentError in Rails 5.3."
+            "This behavior is now deprecated and will result in an ArgumentError in Rails 6.0."
         end
 
         return super()
@@ -86,7 +86,7 @@ def sum(column_name = nil)
         unless column_name.nil?
           ActiveSupport::Deprecation.warn \
             "When `sum' is called with a block, it ignores other arguments. " \
-            "This behavior is now deprecated and will result in an ArgumentError in Rails 5.3."
+            "This behavior is now deprecated and will result in an ArgumentError in Rails 6.0."
         end
 
         return super()