diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2016-11-22 20:12:01 +0300 |
|---|---|---|
| committer | Alejandro Rodríguez <alejorro70@gmail.com> | 2016-11-24 18:29:46 +0300 |
| commit | 64de0e0aa573c5aca9fe03024d41c6d43c5616d6 (patch) | |
| tree | 4eeeea4185c5f2e307242d75a5a1482e5945dbbf | |
| parent | f587a1f0f941b9653a40355943a54fbaf6a365fa (diff) | |
Merge branch '24804-wrong-render-index-should-be-render-show-in-projects-pipelinessettingscontroller-update' into 'master'
Resolve "Wrong `render 'index'`, should be `render 'show'` in `Projects::PipelinesSettingsController#update`"
Closes #24804
See merge request !7665
| -rw-r--r-- | app/controllers/projects/pipelines_settings_controller.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/24804-wrong-render-index-should-be-render-show-in-projects-pipelinessettingscontroller-update.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/projects/pipelines_settings_controller.rb b/app/controllers/projects/pipelines_settings_controller.rb index 9136633b87a..53ce23221ed 100644 --- a/app/controllers/projects/pipelines_settings_controller.rb +++ b/app/controllers/projects/pipelines_settings_controller.rb @@ -17,7 +17,7 @@ class Projects::PipelinesSettingsController < Projects::ApplicationController flash[:notice] = "CI/CD Pipelines settings for '#{@project.name}' were successfully updated." redirect_to namespace_project_pipelines_settings_path(@project.namespace, @project) else - render 'index' + render 'show' end end diff --git a/changelogs/unreleased/24804-wrong-render-index-should-be-render-show-in-projects-pipelinessettingscontroller-update.yml b/changelogs/unreleased/24804-wrong-render-index-should-be-render-show-in-projects-pipelinessettingscontroller-update.yml new file mode 100644 index 00000000000..92dbbe3d164 --- /dev/null +++ b/changelogs/unreleased/24804-wrong-render-index-should-be-render-show-in-projects-pipelinessettingscontroller-update.yml @@ -0,0 +1,4 @@ +--- +title: Fix wrong template rendered when CI/CD settings aren't update successfully +merge_request: 7665 +author: |