diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-03-08 09:32:36 -0300 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-03-08 09:34:33 -0300 |
| commit | 958892444067fcd522920bd1b4ae02ec133b5cdd (patch) | |
| tree | c7340c603af9c79e89acc5dfa3c1b647cd40ab1c /activerecord/lib/active_record | |
| parent | 9f007d7fe5f90257c71baa2c4e7c76fb44512986 (diff) | |
| download | rails-958892444067fcd522920bd1b4ae02ec133b5cdd.tar.gz rails-958892444067fcd522920bd1b4ae02ec133b5cdd.tar.bz2 rails-958892444067fcd522920bd1b4ae02ec133b5cdd.zip | |
Update test name to reflect change in how scopes merging works
Introduced in f1082b8588a9144eedb34d511f0074031f692d98.
Full changelog in 9f007d7fe5f90257c71baa2c4e7c76fb44512986.
[ci skip]
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/scoping/named.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/scoping/named.rb b/activerecord/lib/active_record/scoping/named.rb index 708b27dd7e..12317601b6 100644 --- a/activerecord/lib/active_record/scoping/named.rb +++ b/activerecord/lib/active_record/scoping/named.rb @@ -167,7 +167,6 @@ module ActiveRecord scope = relation.merge(scope) scope.default_scoped = default_scoped end - else scope = body end |