diff options
| author | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-10-18 19:03:31 +0100 |
|---|---|---|
| committer | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-11-07 15:56:18 +0000 |
| commit | 011e561bfa227f3ecbafe5b1ffd51700c680a15f (patch) | |
| tree | 58af709e0f38dbfd7d389e2c3ad5516507ca2946 /app/controllers/profiles_controller.rb | |
| parent | 9d51421346178c9189ffb47189f51d573ab42822 (diff) | |
| download | gitlab-ce-011e561bfa227f3ecbafe5b1ffd51700c680a15f.tar.gz | |
implements reset incoming email token on issues modal and account page,use-separate-token-for-incoming-email
reactivates all tests and writes more tests for it
Diffstat (limited to 'app/controllers/profiles_controller.rb')
| -rw-r--r-- | app/controllers/profiles_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb index e4865642cd3..f0c71725ea8 100644 --- a/app/controllers/profiles_controller.rb +++ b/app/controllers/profiles_controller.rb @@ -26,7 +26,7 @@ class ProfilesController < Profiles::ApplicationController def reset_private_token if current_user.reset_authentication_token! - flash[:notice] = "Private token was successfully updated" + flash[:notice] = "Private token was successfully reset" end redirect_to profile_account_path @@ -34,7 +34,7 @@ class ProfilesController < Profiles::ApplicationController def reset_incoming_email_token if current_user.reset_incoming_email_token! - flash[:notice] = "Incoming email token was successfully updated" + flash[:notice] = "Incoming email token was successfully reset" end redirect_to profile_account_path |