diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-10-05 07:01:04 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-10-05 07:01:04 -0700 |
| commit | 3142eec0ff5a2850f54ca2779e5ade241297fb85 (patch) | |
| tree | 4e95e98d02bb14b221e8e853aae5dde484f599cf | |
| parent | d031e0e88f4c26fc7c77e246ab28c8490ca00183 (diff) | |
| download | gitlab-ce-3142eec0ff5a2850f54ca2779e5ade241297fb85.tar.gz | |
Revert "Merge branch 'deploy-tokens' into 'master'"
This reverts commit 3df32ac1290160680473248b48d1b12c96458bf7, reversing
changes made to dd1295a30f28eeb3c7058b1899e00db7943f3e54.
| -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 |