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
This commit is contained in:
Kamil Trzciński 2016-11-22 17:12:01 +00:00
commit c4376b2f88
2 changed files with 5 additions and 1 deletions

View file

@ -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

View file

@ -0,0 +1,4 @@
---
title: Fix wrong template rendered when CI/CD settings aren't update successfully
merge_request: 7665
author: