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
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2017-01-24 01:19:39 +0300
committerJose Ivan Vargas <jvargas@gitlab.com>2017-02-06 23:51:18 +0300
commit8ffe586b778b905f57382485140efea4c3dcad93 (patch)
treecbbba900cb46923ad0771bb711f44f9cf388d516 /app/controllers/projects/pipelines_settings_controller.rb
parent085d5eae8a13f6ac032321a601916eb6493045b8 (diff)
Changed the controller/route name to 'ci/cd' and renamed the corresponding files
Added tests to verify the access policy to the new controller
Diffstat (limited to 'app/controllers/projects/pipelines_settings_controller.rb')
-rw-r--r--app/controllers/projects/pipelines_settings_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/pipelines_settings_controller.rb b/app/controllers/projects/pipelines_settings_controller.rb
index 3e5ad6cebb0..c8c80551ac9 100644
--- a/app/controllers/projects/pipelines_settings_controller.rb
+++ b/app/controllers/projects/pipelines_settings_controller.rb
@@ -2,13 +2,13 @@ class Projects::PipelinesSettingsController < Projects::ApplicationController
before_action :authorize_admin_pipeline!
def show
- redirect_to namespace_project_settings_ci_cd_pipelines_path(@project.namespace, @project, params: params)
+ redirect_to namespace_project_settings_ci_cd_path(@project.namespace, @project, params: params)
end
def update
if @project.update_attributes(update_params)
flash[:notice] = "CI/CD Pipelines settings for '#{@project.name}' were successfully updated."
- redirect_to namespace_project_settings_ci_cd_pipelines_path(@project.namespace, @project)
+ redirect_to namespace_project_settings_ci_cd_path(@project.namespace, @project)
else
render 'show'
end