aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib
diff options
context:
space:
mode:
authorJeffrey Guenther <guenther.jeffrey@gmail.com>2017-11-09 09:31:16 -0800
committerJeffrey Guenther <guenther.jeffrey@gmail.com>2017-11-09 09:31:16 -0800
commitd0550ff6717f18961493ab065ff2eebed6199525 (patch)
treef5ff24082dd79e429b7a33e8fe217ffa3bc0b02b /activemodel/lib
parentd58078d8d65de38d9dca9c629c91e13df291dbb3 (diff)
parent5961d6882bc3a6aaa2b3735e7a8cbe3f2fb901af (diff)
downloadrails-d0550ff6717f18961493ab065ff2eebed6199525.tar.gz
rails-d0550ff6717f18961493ab065ff2eebed6199525.tar.bz2
rails-d0550ff6717f18961493ab065ff2eebed6199525.zip
Merge branch 'master' into activestorage-guide
Diffstat (limited to 'activemodel/lib')
-rw-r--r--activemodel/lib/active_model/validations/confirmation.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/validations/confirmation.rb b/activemodel/lib/active_model/validations/confirmation.rb
index 0abec56b68..1b5d5b09ab 100644
--- a/activemodel/lib/active_model/validations/confirmation.rb
+++ b/activemodel/lib/active_model/validations/confirmation.rb
@@ -9,7 +9,7 @@ module ActiveModel
end
def validate_each(record, attribute, value)
- if (confirmed = record.send("#{attribute}_confirmation"))
+ unless (confirmed = record.send("#{attribute}_confirmation")).nil?
unless confirmation_value_equal?(record, attribute, value, confirmed)
human_attribute_name = record.class.human_attribute_name(attribute)
record.errors.add(:"#{attribute}_confirmation", :confirmation, options.except(:case_sensitive).merge!(attribute: human_attribute_name))