Merge branch 'runners-paginate' into 'master'

Fixes error 500 on Runners page (`ActionView::Template::Error (Missing partial kaminari/_paginator`) Originally reported downstream: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=819903 See merge request !5701

Merge branch 'runners-paginate' into 'master'
434ad2b9 · Rémy Coutable · 3a6a6465 · 24538ec0 · 434ad2b9 · 434ad2b9
Commit 434ad2b9 authored Oct 21, 2016 by Rémy Coutable
Showing with 3 additions and 3 deletions

index.html.haml app/views/admin/runners/index.html.haml +1 -1

show.html.haml app/views/admin/runners/show.html.haml +1 -1

_specific_runners.html.haml app/views/projects/runners/_specific_runners.html.haml +1 -1

No files found.
--- a/app/views/admin/runners/index.html.haml
+++ b/app/views/admin/runners/index.html.haml
@@ -75,4 +75,4 @@

      - @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
@@ -67,7 +67,7 @@
              = 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

--- a/app/views/projects/runners/_specific_runners.html.haml
+++ b/app/views/projects/runners/_specific_runners.html.haml
@@ -26,4 +26,4 @@
  %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"