diff options
| author | Paco Guzman <fjguzman@aspgems.com> | 2010-01-18 08:45:24 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-18 16:36:08 +0100 |
| commit | e27bfad6a5f9e9171148226dee7ce51d41731ea7 (patch) | |
| tree | 54f726c70a14e94819fbd7e951f1f88b79b1178b /activerecord | |
| parent | a2b76d1dde09ad1a93a0e631bd6ba9a00f5cc1d5 (diff) | |
| download | rails-e27bfad6a5f9e9171148226dee7ce51d41731ea7.tar.gz rails-e27bfad6a5f9e9171148226dee7ce51d41731ea7.tar.bz2 rails-e27bfad6a5f9e9171148226dee7ce51d41731ea7.zip | |
Forgot to change named_scope to scope in an ArgumentError raise exception for duplication scopes related to commit d60bb0a9e4be [#3736 status:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/named_scope.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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| |