summaryrefslogtreecommitdiff
path: root/app/controllers/projects/runners_controller.rb
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2017-01-03 17:57:55 -0600
committerJose Ivan Vargas <jvargas@gitlab.com>2017-02-06 14:51:18 -0600
commit58110293d4425c50a87975749551e069a02dc0cd (patch)
tree30df8e75fa51d1aa14002b05e2ed2fa806ca24d0 /app/controllers/projects/runners_controller.rb
parentee43dcd5d633f19b13a1d914a403686faec2bbca (diff)
downloadgitlab-ce-58110293d4425c50a87975749551e069a02dc0cd.tar.gz
Converted the views to partials that compose the menu item "pipelines"
Diffstat (limited to 'app/controllers/projects/runners_controller.rb')
-rw-r--r--app/controllers/projects/runners_controller.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/app/controllers/projects/runners_controller.rb b/app/controllers/projects/runners_controller.rb
index 53c36635efe..db69abe0337 100644
--- a/app/controllers/projects/runners_controller.rb
+++ b/app/controllers/projects/runners_controller.rb
@@ -5,11 +5,7 @@ class Projects::RunnersController < Projects::ApplicationController
layout 'project_settings'
def index
- @project_runners = project.runners.ordered
- @assignable_runners = current_user.ci_authorized_runners.
- assignable_for(project).ordered.page(params[:page]).per(20)
- @shared_runners = Ci::Runner.shared.active
- @shared_runners_count = @shared_runners.count(:all)
+ redirect_to namespace_project_settings_pipelines_path(@project.namespace, @project)
end
def edit
@@ -53,7 +49,7 @@ class Projects::RunnersController < Projects::ApplicationController
def toggle_shared_runners
project.toggle!(:shared_runners_enabled)
- redirect_to namespace_project_runners_path(project.namespace, project)
+ redirect_to namespace_project_settings_pipelines_path(@project.namespace, @project)
end
protected