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-12 00:37:46 +0300
committerJose Ivan Vargas <jvargas@gitlab.com>2017-02-06 23:51:18 +0300
commit8c1e9ecde3f07bc74a6d6c1be54ba55a0932a2d6 (patch)
tree962dd4bb56817f877472dde174fb979b6a96098b /app/controllers/projects/triggers_controller.rb
parente4b345ca4c36fc44ae0365ac1db3d809dd9f5608 (diff)
Corrected tests and changed trigger controller redirects to the ci_cd_pipelines_settings controller
Diffstat (limited to 'app/controllers/projects/triggers_controller.rb')
-rw-r--r--app/controllers/projects/triggers_controller.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/projects/triggers_controller.rb b/app/controllers/projects/triggers_controller.rb
index d580fcfe33c..06e9793fba5 100644
--- a/app/controllers/projects/triggers_controller.rb
+++ b/app/controllers/projects/triggers_controller.rb
@@ -4,7 +4,7 @@ class Projects::TriggersController < Projects::ApplicationController
layout 'project_settings'
def index
- redirect_to namespace_project_settings_pipelines_path(@project.namespace, @project)
+ redirect_to namespace_project_settings_ci_cd_pipelines_path(@project.namespace, @project)
end
def create
@@ -12,7 +12,7 @@ class Projects::TriggersController < Projects::ApplicationController
@trigger.save
if @trigger.valid?
- redirect_to namespace_project_settings_pipelines_path(@project.namespace, @project)
+ redirect_to namespace_project_settings_ci_cd_pipelines_path(@project.namespace, @project)
else
@triggers = project.triggers.select(&:persisted?)
render :index
@@ -22,7 +22,7 @@ class Projects::TriggersController < Projects::ApplicationController
def destroy
trigger.destroy
- redirect_to namespace_project_settings_pipelines_path(@project.namespace, @project)
+ redirect_to namespace_project_settings_ci_cd_pipelines_path(@project.namespace, @project)
end
private