From e27bfad6a5f9e9171148226dee7ce51d41731ea7 Mon Sep 17 00:00:00 2001 From: Paco Guzman Date: Mon, 18 Jan 2010 08:45:24 +0100 Subject: Forgot to change named_scope to scope in an ArgumentError raise exception for duplication scopes related to commit d60bb0a9e4be [#3736 status:resolved] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Valim --- activerecord/lib/active_record/named_scope.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord') diff --git a/activerecord/lib/active_record/named_scope.rb b/activerecord/lib/active_record/named_scope.rb index 5c0cf10f4c..2d88f49f5f 100644 --- a/activerecord/lib/active_record/named_scope.rb +++ b/activerecord/lib/active_record/named_scope.rb @@ -101,7 +101,7 @@ module ActiveRecord name = name.to_sym if !scopes[name] && respond_to?(name, true) - raise ArgumentError, "Cannot define named_scope :#{name} because #{self.name}.#{name} method already exists." + raise ArgumentError, "Cannot define scope :#{name} because #{self.name}.#{name} method already exists." end scopes[name] = lambda do |parent_scope, *args| -- cgit v1.2.3