diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-06-28 00:12:15 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-06-28 00:12:15 +0200 |
| commit | 4329f8133fee8e4f3e558787f67de59f0c4a4dd1 (patch) | |
| tree | 346ef7340d8348e50d119ca749a16c1654c20a08 /activerecord/lib/active_record/validations/uniqueness.rb | |
| parent | c37f7d66e49ffe5ac2115cc30e5529fd1c2924a8 (diff) | |
| parent | ebee77a28a7267d5f23a28ba23c1eb88a2d7d527 (diff) | |
| download | rails-4329f8133fee8e4f3e558787f67de59f0c4a4dd1.tar.gz rails-4329f8133fee8e4f3e558787f67de59f0c4a4dd1.tar.bz2 rails-4329f8133fee8e4f3e558787f67de59f0c4a4dd1.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'activerecord/lib/active_record/validations/uniqueness.rb')
| -rw-r--r-- | activerecord/lib/active_record/validations/uniqueness.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/validations/uniqueness.rb b/activerecord/lib/active_record/validations/uniqueness.rb index 6283bdd0d6..1c9ecc7b1b 100644 --- a/activerecord/lib/active_record/validations/uniqueness.rb +++ b/activerecord/lib/active_record/validations/uniqueness.rb @@ -32,7 +32,7 @@ module ActiveRecord end if relation.exists? - record.errors.add(attribute, :taken, :default => options[:message], :value => value) + record.errors.add(attribute, :taken, options.except(:case_sensitive, :scope).merge(:value => value)) end end |