diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-10-05 19:51:29 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-10-05 19:51:29 +0300 |
| commit | 2f720ddd597af85772e266c91d321f6e202a9d80 (patch) | |
| tree | 389f519f45c9a18b82673512dccf92cdaaca6758 | |
| parent | 059da9bc8eb9355a760031ef8e73b0aa6285012f (diff) | |
| parent | 3142eec0ff5a2850f54ca2779e5ade241297fb85 (diff) | |
Merge branch 'sh-revert-broken-deploy-key-change' into 'master'
Revert "Merge branch 'deploy-tokens' into 'master'"
Closes #52228
See merge request gitlab-org/gitlab-ce!22149
| -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 6d83d24cdb8..1d76c90d4eb 100644 --- a/app/controllers/projects/settings/repository_controller.rb +++ b/app/controllers/projects/settings/repository_controller.rb @@ -14,10 +14,10 @@ module Projects @new_deploy_token = DeployTokens::CreateService.new(@project, current_user, deploy_token_params).execute if @new_deploy_token.persisted? - flash[:notice] = s_('DeployTokens|Your new project deploy token has been created.') + flash.now[:notice] = s_('DeployTokens|Your new project deploy token has been created.') end - redirect_to action: :show + render_show end private |