diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-09-25 09:37:08 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-09-25 09:37:08 +0000 |
| commit | 3df32ac1290160680473248b48d1b12c96458bf7 (patch) | |
| tree | 8302836a52a11ba78c5d9c8859373ed845cf284f | |
| parent | dd1295a30f28eeb3c7058b1899e00db7943f3e54 (diff) | |
| parent | 725b5bc1dea7551214b596f489f1dfec524ff912 (diff) | |
| download | gitlab-ce-3df32ac1290160680473248b48d1b12c96458bf7.tar.gz | |
Merge branch 'deploy-tokens' into 'master'
use redirect instead of render to avoid creating keys when refresh - resolves #47942
Closes #47942
See merge request gitlab-org/gitlab-ce!20363
| -rw-r--r-- | app/controllers/projects/settings/repository_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/settings/repository_controller.rb b/app/controllers/projects/settings/repository_controller.rb index ccd481b4dbd..0d43cdbe417 100644 --- a/app/controllers/projects/settings/repository_controller.rb +++ b/app/controllers/projects/settings/repository_controller.rb @@ -12,10 +12,10 @@ module Projects @new_deploy_token = DeployTokens::CreateService.new(@project, current_user, deploy_token_params).execute if @new_deploy_token.persisted? - flash.now[:notice] = s_('DeployTokens|Your new project deploy token has been created.') + flash[:notice] = s_('DeployTokens|Your new project deploy token has been created.') end - render_show + redirect_to action: :show end private |