diff options
author | Rémy Coutable <remy@rymai.me> | 2016-10-21 14:58:26 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-10-21 14:58:26 +0000 |
commit | 434ad2b9274869660e61383c0b461fd333cbc6f7 (patch) | |
tree | 2801e3e0888f0a7c2945dd580f1d2e9d322e2c21 /app/views/projects/runners | |
parent | 3a6a64655097a930ce4337243470cbc500b03a08 (diff) | |
parent | 24538ec0902667d399b47c7715aa75035aacecf2 (diff) | |
download | gitlab-ce-434ad2b9274869660e61383c0b461fd333cbc6f7.tar.gz |
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
Diffstat (limited to 'app/views/projects/runners')
-rw-r--r-- | app/views/projects/runners/_specific_runners.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/runners/_specific_runners.html.haml b/app/views/projects/runners/_specific_runners.html.haml index 858af78f7bf..51b0939564e 100644 --- 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" |