Commit 434ad2b9 authored by Rémy Coutable's avatar Rémy Coutable

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
parents 3a6a6465 24538ec0
...@@ -75,4 +75,4 @@ ...@@ -75,4 +75,4 @@
- @runners.each do |runner| - @runners.each do |runner|
= render "admin/runners/runner", runner: runner = render "admin/runners/runner", runner: runner
= paginate @runners = paginate @runners, theme: "gitlab"
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
= form_for [:admin, project.namespace.becomes(Namespace), project, project.runner_projects.new] do |f| = form_for [:admin, project.namespace.becomes(Namespace), project, project.runner_projects.new] do |f|
= f.hidden_field :runner_id, value: @runner.id = f.hidden_field :runner_id, value: @runner.id
= f.submit 'Enable', class: 'btn btn-xs' = f.submit 'Enable', class: 'btn btn-xs'
= paginate @projects = paginate @projects, theme: "gitlab"
.col-md-6 .col-md-6
%h4 Recent builds served by this Runner %h4 Recent builds served by this Runner
......
...@@ -26,4 +26,4 @@ ...@@ -26,4 +26,4 @@
%h4.underlined-title Available specific runners %h4.underlined-title Available specific runners
%ul.bordered-list.available-specific-runners %ul.bordered-list.available-specific-runners
= render partial: 'runner', collection: @assignable_runners, as: :runner = render partial: 'runner', collection: @assignable_runners, as: :runner
= paginate @assignable_runners = paginate @assignable_runners, theme: "gitlab"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment