diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-04-24 18:50:45 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-04-24 18:50:45 +0300 |
| commit | 23e5d9edcee5c0504bec9aade0e5abbb86ce06b1 (patch) | |
| tree | c70ebb687b951e80abea971d1d2cc882e97db113 /app/controllers | |
| parent | 90ddfda612eba5533dccebbba205bac9dd8f0ac6 (diff) | |
| parent | ef67a54afa19f16585f8b78bc44ad6c91a7724b0 (diff) | |
Merge branch '54656-500-error-on-save-of-general-pipeline-settings-timeout' into 'master'
Resolve "500 error on save of general pipeline settings timeout"
Closes gitlab-ee#11281
See merge request gitlab-org/gitlab-ce!27416
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/settings/ci_cd_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb index d1c5cef76fa..c4dff95a4b9 100644 --- a/app/controllers/projects/settings/ci_cd_controller.rb +++ b/app/controllers/projects/settings/ci_cd_controller.rb @@ -19,7 +19,7 @@ module Projects redirect_to project_settings_ci_cd_path(@project) else - render 'show' + redirect_to project_settings_ci_cd_path(@project), alert: result[:message] end end end |