diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-11-17 01:50:49 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-11-17 01:50:49 +0530 |
| commit | 7b70eeed43045dc29e73e23fbfdc323e9d397026 (patch) | |
| tree | 8c60cd5893f7e2d231130b7c0abdc0aee8e3bec7 /activemodel/lib/active_model | |
| parent | 8eefdb6d7056dc0d4d63a5c34a4b12701ba21c88 (diff) | |
| parent | 1fd008cd44cd2eea37db57ee6b3c17d3585d88c1 (diff) | |
| download | rails-7b70eeed43045dc29e73e23fbfdc323e9d397026.tar.gz rails-7b70eeed43045dc29e73e23fbfdc323e9d397026.tar.bz2 rails-7b70eeed43045dc29e73e23fbfdc323e9d397026.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
actionpack/lib/action_dispatch/routing/redirection.rb
Diffstat (limited to 'activemodel/lib/active_model')
| -rw-r--r-- | activemodel/lib/active_model/secure_password.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activemodel/lib/active_model/secure_password.rb b/activemodel/lib/active_model/secure_password.rb index 3dc615c9f3..081a49f749 100644 --- a/activemodel/lib/active_model/secure_password.rb +++ b/activemodel/lib/active_model/secure_password.rb @@ -13,6 +13,10 @@ module ActiveModel # you wish to turn off validations, pass <tt>validations: false</tt> as an # argument. You can add more validations by hand if need be. # + # If you don't need the confirmation validation, just don't set any + # value to the password_confirmation attribute and the the validation + # will not be triggered. + # # You need to add bcrypt-ruby (~> 3.0.0) to Gemfile to use #has_secure_password: # # gem 'bcrypt-ruby', '~> 3.0.0' |