Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2016-11-22 20:12:01 +0300
committerKamil Trzciński <ayufan@ayufan.eu>2016-11-22 20:12:01 +0300
commitc4376b2f88ac3089719382aaf7385fc6907b369e (patch)
treec752e878d34c14549f4eb8b2760647ccc3483809 /app
parentfff7a1a9f7b8acb59b83af70ae7a575f424f4319 (diff)
parent42855f116abf6822f3e7d6923bbc296f35054067 (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
Diffstat (limited to 'app')
-rw-r--r--app/controllers/projects/pipelines_settings_controller.rb2
1 files changed, 1 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