Merge branch…

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

Merge branch…
c4376b2f · Kamil Trzciński · fff7a1a9 · 42855f11 · c4376b2f · c4376b2f
Commit c4376b2f authored Nov 22, 2016 by Kamil Trzciński
2 changed files
--- 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


--- 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
+---
+title: Fix wrong template rendered when CI/CD settings aren't update successfully
+merge_request: 7665
+author: