summaryrefslogtreecommitdiff
path: root/app/controllers/projects/triggers_controller.rb
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2017-01-23 16:19:39 -0600
committerJose Ivan Vargas <jvargas@gitlab.com>2017-02-06 14:51:18 -0600
commit8ffe586b778b905f57382485140efea4c3dcad93 (patch)
treecbbba900cb46923ad0771bb711f44f9cf388d516 /app/controllers/projects/triggers_controller.rb
parent085d5eae8a13f6ac032321a601916eb6493045b8 (diff)
downloadgitlab-ce-8ffe586b778b905f57382485140efea4c3dcad93.tar.gz
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/triggers_controller.rb')
-rw-r--r--app/controllers/projects/triggers_controller.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/app/controllers/projects/triggers_controller.rb b/app/controllers/projects/triggers_controller.rb
index 06e9793fba5..250b5becb84 100644
--- a/app/controllers/projects/triggers_controller.rb
+++ b/app/controllers/projects/triggers_controller.rb
@@ -3,16 +3,12 @@ class Projects::TriggersController < Projects::ApplicationController
layout 'project_settings'
- def index
- redirect_to namespace_project_settings_ci_cd_pipelines_path(@project.namespace, @project)
- end
-
def create
@trigger = project.triggers.new
@trigger.save
if @trigger.valid?
- redirect_to namespace_project_settings_ci_cd_pipelines_path(@project.namespace, @project)
+ redirect_to namespace_project_settings_ci_cd_path(@project.namespace, @project)
else
@triggers = project.triggers.select(&:persisted?)
render :index
@@ -22,7 +18,7 @@ class Projects::TriggersController < Projects::ApplicationController
def destroy
trigger.destroy
- redirect_to namespace_project_settings_ci_cd_pipelines_path(@project.namespace, @project)
+ redirect_to namespace_project_settings_ci_cd_path(@project.namespace, @project)
end
private