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-04 02:57:55 +0300
committerJose Ivan Vargas <jvargas@gitlab.com>2017-02-06 23:51:18 +0300
commit58110293d4425c50a87975749551e069a02dc0cd (patch)
tree30df8e75fa51d1aa14002b05e2ed2fa806ca24d0 /app/controllers/projects/triggers_controller.rb
parentee43dcd5d633f19b13a1d914a403686faec2bbca (diff)
Converted the views to partials that compose the menu item "pipelines"
Diffstat (limited to 'app/controllers/projects/triggers_controller.rb')
-rw-r--r--app/controllers/projects/triggers_controller.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/app/controllers/projects/triggers_controller.rb b/app/controllers/projects/triggers_controller.rb
index 92359745cec..d580fcfe33c 100644
--- a/app/controllers/projects/triggers_controller.rb
+++ b/app/controllers/projects/triggers_controller.rb
@@ -4,8 +4,7 @@ class Projects::TriggersController < Projects::ApplicationController
layout 'project_settings'
def index
- @triggers = project.triggers
- @trigger = Ci::Trigger.new
+ redirect_to namespace_project_settings_pipelines_path(@project.namespace, @project)
end
def create
@@ -13,7 +12,7 @@ class Projects::TriggersController < Projects::ApplicationController
@trigger.save
if @trigger.valid?
- redirect_to namespace_project_triggers_path(@project.namespace, @project)
+ redirect_to namespace_project_settings_pipelines_path(@project.namespace, @project)
else
@triggers = project.triggers.select(&:persisted?)
render :index
@@ -23,7 +22,7 @@ class Projects::TriggersController < Projects::ApplicationController
def destroy
trigger.destroy
- redirect_to namespace_project_triggers_path(@project.namespace, @project)
+ redirect_to namespace_project_settings_pipelines_path(@project.namespace, @project)
end
private