2016-08-08 11:47:21 +05:30
|
|
|
Last-Update: 2016-08-08
|
2016-08-08 12:05:38 +05:30
|
|
|
Forwarded: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5701
|
2016-08-08 11:47:21 +05:30
|
|
|
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=819903
|
|
|
|
Author: Libor Klepáč <libor.klepac@bcom.cz>
|
|
|
|
Reviewed-By: Dmitry Smirnov <onlyjob@debian.org>
|
|
|
|
Description: fix error 500 on runners page.
|
|
|
|
"ActionView::Template::Error (Missing partial kaminari/_paginator"
|
|
|
|
|
2016-08-24 20:52:28 +05:30
|
|
|
Index: gitlab/app/views/admin/runners/index.html.haml
|
|
|
|
===================================================================
|
|
|
|
--- gitlab.orig/app/views/admin/runners/index.html.haml
|
|
|
|
+++ gitlab/app/views/admin/runners/index.html.haml
|
|
|
|
@@ -73,4 +73,4 @@
|
2016-08-08 11:47:21 +05:30
|
|
|
|
|
|
|
- @runners.each do |runner|
|
|
|
|
= render "admin/runners/runner", runner: runner
|
|
|
|
- = paginate @runners
|
|
|
|
+ = paginate @runners, theme: "gitlab"
|
2016-08-24 20:52:28 +05:30
|
|
|
Index: gitlab/app/views/admin/runners/show.html.haml
|
|
|
|
===================================================================
|
|
|
|
--- gitlab.orig/app/views/admin/runners/show.html.haml
|
|
|
|
+++ gitlab/app/views/admin/runners/show.html.haml
|
|
|
|
@@ -67,7 +67,7 @@
|
2016-08-08 11:47:21 +05:30
|
|
|
= form_for [:admin, project.namespace.becomes(Namespace), project, project.runner_projects.new] do |f|
|
|
|
|
= f.hidden_field :runner_id, value: @runner.id
|
|
|
|
= f.submit 'Enable', class: 'btn btn-xs'
|
|
|
|
- = paginate @projects
|
|
|
|
+ = paginate @projects, theme: "gitlab"
|
|
|
|
|
|
|
|
.col-md-6
|
|
|
|
%h4 Recent builds served by this runner
|
2016-08-24 20:52:28 +05:30
|
|
|
Index: gitlab/app/views/projects/runners/_specific_runners.html.haml
|
|
|
|
===================================================================
|
|
|
|
--- gitlab.orig/app/views/projects/runners/_specific_runners.html.haml
|
|
|
|
+++ gitlab/app/views/projects/runners/_specific_runners.html.haml
|
|
|
|
@@ -26,4 +26,4 @@
|
2016-08-08 11:47:21 +05:30
|
|
|
%h4.underlined-title Available specific runners
|
|
|
|
%ul.bordered-list.available-specific-runners
|
|
|
|
= render partial: 'runner', collection: @assignable_runners, as: :runner
|
|
|
|
- = paginate @assignable_runners
|
|
|
|
+ = paginate @assignable_runners, theme: "gitlab"
|