New patch to fix error 500 on runners page (Closes: #819903).

Thanks, Libor Klepáč.
This commit is contained in:
Dmitry Smirnov 2016-08-08 16:17:21 +10:00
parent 17f5cf8efd
commit 49de153b1d
2 changed files with 40 additions and 0 deletions

39
debian/patches/runners.patch vendored Normal file
View file

@ -0,0 +1,39 @@
Last-Update: 2016-08-08
Forwarded: no
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"
--- a/app/views/admin/runners/index.html.haml
+++ b/app/views/admin/runners/index.html.haml
@@ -69,5 +69,5 @@
%th
- @runners.each do |runner|
= render "admin/runners/runner", runner: runner
- = paginate @runners
+ = paginate @runners, theme: "gitlab"
--- a/app/views/admin/runners/show.html.haml
+++ b/app/views/admin/runners/show.html.haml
@@ -66,9 +66,9 @@
.pull-right
= 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
%table.table.builds.runner-builds
--- a/app/views/projects/runners/_specific_runners.html.haml
+++ b/app/views/projects/runners/_specific_runners.html.haml
@@ -25,5 +25,5 @@
- if @assignable_runners.any?
%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"

View file

@ -8,6 +8,7 @@
0108-make-mysql-optional.patch
source-init-functions.patch
pid-log-paths.patch
runners.patch
0200-use-jquery-for-jquery2.patch
052-relax-grape.patch
053-relax-rouge.patch