diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-08-19 18:33:46 -0500 |
|---|---|---|
| committer | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-11-07 15:55:42 +0000 |
| commit | 9d51421346178c9189ffb47189f51d573ab42822 (patch) | |
| tree | 4990e9766af58e9dfc687f5451c6efe36fdbebcd /app/controllers | |
| parent | 09f4af04c6672f7e2d1584f9940a3d9ff53a4a4f (diff) | |
| download | gitlab-ce-9d51421346178c9189ffb47189f51d573ab42822.tar.gz | |
Use separate email-friendly token for incoming email and let incoming
email token be reset
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/profiles_controller.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb index f71e0a1302b..e4865642cd3 100644 --- a/app/controllers/profiles_controller.rb +++ b/app/controllers/profiles_controller.rb @@ -26,7 +26,15 @@ class ProfilesController < Profiles::ApplicationController def reset_private_token if current_user.reset_authentication_token! - flash[:notice] = "Token was successfully updated" + flash[:notice] = "Private token was successfully updated" + end + + redirect_to profile_account_path + end + + def reset_incoming_email_token + if current_user.reset_incoming_email_token! + flash[:notice] = "Incoming email token was successfully updated" end redirect_to profile_account_path |