diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-11-15 19:06:28 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-11-15 19:06:28 +0000 |
| commit | 1d16530501b18528b1955251aa33a26b81f53161 (patch) | |
| tree | d34964c3f4d499bbeca2da5ee5ef661fe09fe37c /app/controllers | |
| parent | 97e3d5ce292d056a9dd15e16823b9570832db02a (diff) | |
| parent | f3cd24a9f3f581488d621475e55e3a81bbd9e67c (diff) | |
| download | gitlab-ce-1d16530501b18528b1955251aa33a26b81f53161.tar.gz | |
Merge branch 'if-53347_fix_impersonation_tokens' into 'master'
Display impersonation token value only after creation
See merge request gitlab-org/gitlab-ce!22916
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/impersonation_tokens_controller.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/admin/impersonation_tokens_controller.rb b/app/controllers/admin/impersonation_tokens_controller.rb index f5825ecb19a..706bcc1e549 100644 --- a/app/controllers/admin/impersonation_tokens_controller.rb +++ b/app/controllers/admin/impersonation_tokens_controller.rb @@ -11,6 +11,7 @@ class Admin::ImpersonationTokensController < Admin::ApplicationController @impersonation_token = finder.build(impersonation_token_params) if @impersonation_token.save + PersonalAccessToken.redis_store!(current_user.id, @impersonation_token.token) redirect_to admin_user_impersonation_tokens_path, notice: "A new impersonation token has been created." else set_index_vars @@ -53,6 +54,8 @@ class Admin::ImpersonationTokensController < Admin::ApplicationController @impersonation_token ||= finder.build @inactive_impersonation_tokens = finder(state: 'inactive').execute @active_impersonation_tokens = finder(state: 'active').execute.order(:expires_at) + + @new_impersonation_token = PersonalAccessToken.redis_getdel(current_user.id) end # rubocop: enable CodeReuse/ActiveRecord end |