diff --git a/activemodel/lib/active_model/locale/en.yml b/activemodel/lib/active_model/locale/en.yml index 1842ba002f..ba49c6beaa 100644 --- a/activemodel/lib/active_model/locale/en.yml +++ b/activemodel/lib/active_model/locale/en.yml @@ -1,8 +1,4 @@ en: - attributes: - # Prevent confusion in form errors due to 'has_secure_password' - password_digest: "Password" - errors: # The default format to use in full error messages. format: "%{attribute} %{message}" diff --git a/activemodel/lib/active_model/secure_password.rb b/activemodel/lib/active_model/secure_password.rb index 7c529cb67b..e7a57cf691 100644 --- a/activemodel/lib/active_model/secure_password.rb +++ b/activemodel/lib/active_model/secure_password.rb @@ -10,19 +10,6 @@ module ActiveModel # a "password_confirmation" attribute) are automatically added. # You can add more validations by hand if need be. # - # Note: the implementation of has_secure_password enforces presence validation - # on the :password_digest attribute rather than on :password, which is - # in fact a virtual reader attribute. However, validates_confirmation_of ensures - # an indirect means of presence validation of :password if the - # :password_confirmation attribute is not nil. - # - # You may want to add presence validation on :password for the benefit of your forms - # - # class User < ActiveRecord::Base - # has_secure_password - # validates :password, :presence => { :on => :create } - # end - # # You need to add bcrypt-ruby (~> 3.0.0) to Gemfile to use has_secure_password: # # gem 'bcrypt-ruby', '~> 3.0.0'