From 958892444067fcd522920bd1b4ae02ec133b5cdd Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Fri, 8 Mar 2013 09:32:36 -0300 Subject: Update test name to reflect change in how scopes merging works Introduced in f1082b8588a9144eedb34d511f0074031f692d98. Full changelog in 9f007d7fe5f90257c71baa2c4e7c76fb44512986. [ci skip] --- activerecord/lib/active_record/scoping/named.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'activerecord/lib/active_record') 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 -- cgit v1.2.3