diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-06-29 11:27:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-29 11:27:10 -0400 |
| commit | 47c74e3dfe4e2532f9a4bc631b73b03fd7623fb8 (patch) | |
| tree | d4677db29354343aa754e17bccc16873c74d0f53 /activerecord | |
| parent | a317af93a39edcd3adbdea21e7d5c377709968f4 (diff) | |
| parent | 1d264f0bcd5081dcb4e5049a8124706f7623e63b (diff) | |
| download | rails-47c74e3dfe4e2532f9a4bc631b73b03fd7623fb8.tar.gz rails-47c74e3dfe4e2532f9a4bc631b73b03fd7623fb8.tar.bz2 rails-47c74e3dfe4e2532f9a4bc631b73b03fd7623fb8.zip | |
Merge pull request #29628 from kamipo/fix_next_version_of_rails
Fix the next version of Rails from 5.3 to 6.0
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/relation/calculations.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb index 24b8be0242..8a54f8f2c3 100644 --- a/activerecord/lib/active_record/relation/calculations.rb +++ b/activerecord/lib/active_record/relation/calculations.rb @@ -41,7 +41,7 @@ module ActiveRecord 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 @@ module ActiveRecord 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() |