From 49de153b1d124234011eefe5beb242655ffb507d Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Mon, 8 Aug 2016 16:17:21 +1000 Subject: [PATCH] New patch to fix error 500 on runners page (Closes: #819903). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks, Libor Klepáč. --- debian/patches/runners.patch | 39 ++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 40 insertions(+) create mode 100644 debian/patches/runners.patch diff --git a/debian/patches/runners.patch b/debian/patches/runners.patch new file mode 100644 index 0000000000..7016af4a76 --- /dev/null +++ b/debian/patches/runners.patch @@ -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áč +Reviewed-By: Dmitry Smirnov +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" diff --git a/debian/patches/series b/debian/patches/series index 444142d0e9..92d4c9e020 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -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