diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-12-08 10:40:17 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-12-08 10:40:17 +0300 |
| commit | 12d33b883adda7093f0f4b838532871036af3925 (patch) | |
| tree | 51d183a8ec1166591392583b58ceaad57ce1377b /app/controllers | |
| parent | eea671a2a6c0b953922c8f8535c09c16cd00e79f (diff) | |
| parent | 116d8cfcfbe26f0bb5c6ac49a841f9555b44cf07 (diff) | |
Merge branch '40754-fix-flash-usage-with-personal-access-token' into 'master'
Fix new personal access token showing up in a flash message
Closes #40754
See merge request gitlab-org/gitlab-ce!15707
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/profiles/personal_access_tokens_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/profiles/personal_access_tokens_controller.rb b/app/controllers/profiles/personal_access_tokens_controller.rb index 6d9873e38df..346eab4ba19 100644 --- a/app/controllers/profiles/personal_access_tokens_controller.rb +++ b/app/controllers/profiles/personal_access_tokens_controller.rb @@ -8,7 +8,7 @@ class Profiles::PersonalAccessTokensController < Profiles::ApplicationController @personal_access_token = finder.build(personal_access_token_params) if @personal_access_token.save - flash[:personal_access_token] = @personal_access_token.token + PersonalAccessToken.redis_store!(current_user.id, @personal_access_token.token) redirect_to profile_personal_access_tokens_path, notice: "Your new personal access token has been created." else set_index_vars @@ -43,5 +43,7 @@ class Profiles::PersonalAccessTokensController < Profiles::ApplicationController @inactive_personal_access_tokens = finder(state: 'inactive').execute @active_personal_access_tokens = finder(state: 'active').execute.order(:expires_at) + + @new_personal_access_token = PersonalAccessToken.redis_getdel(current_user.id) end end |