diff options
author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-04-12 07:33:06 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-04-12 07:33:06 +0000 |
commit | 9df14763057359a02daa3b7673cbbeb145e14420 (patch) | |
tree | 580ac345a6fd2d5cb15ecc63568b662943591d36 /app/controllers | |
parent | 0e09cb28051de0623a8fed610f18540246fabd77 (diff) | |
parent | 57afaf9d92eb7d34d51d89ba7af350531f2e0fde (diff) | |
download | gitlab-ce-9df14763057359a02daa3b7673cbbeb145e14420.tar.gz |
Merge branch 'rs-issue-1942' into 'master'
Upon successful login, clear `reset_password_token` field
Closes #1942
See merge request !1757
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/sessions_controller.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 7b6982c5074..3f11d7afe6f 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -26,6 +26,12 @@ class SessionsController < Devise::SessionsController end def create - super + super do |resource| + # User has successfully signed in, so clear any unused reset tokens + if resource.reset_password_token.present? + resource.update_attributes(reset_password_token: nil, + reset_password_sent_at: nil) + end + end end end |