summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-08-21 05:23:59 +0000
committerMike Greiling <mike@pixelcog.com>2018-08-21 05:23:59 +0000
commitcbdd306ca32762c5268a69f7150eb49fd0c17696 (patch)
tree8af337ea215050157636bc818bf63303f6a58bc7
parente4e172a221a917e86a83c39daea5f3276377ed63 (diff)
parent5667422af780c095c684fc64b360474b78c05705 (diff)
downloadgitlab-ce-cbdd306ca32762c5268a69f7150eb49fd0c17696.tar.gz
Merge branch '42754-runners-pagination' into 'master'
Resolve "UX bug in CI Runner settings on projects with many runners" Closes #42754 See merge request gitlab-org/gitlab-ce!21314
-rw-r--r--app/views/projects/runners/_specific_runners.html.haml2
-rw-r--r--changelogs/unreleased/42754-runners-pagination.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/projects/runners/_specific_runners.html.haml b/app/views/projects/runners/_specific_runners.html.haml
index 6c11ce3b394..314af44490e 100644
--- a/app/views/projects/runners/_specific_runners.html.haml
+++ b/app/views/projects/runners/_specific_runners.html.haml
@@ -13,4 +13,4 @@
%h4.underlined-title Available specific runners
%ul.bordered-list.available-specific-runners
= render partial: 'projects/runners/runner', collection: @assignable_runners, as: :runner
- = paginate @assignable_runners, theme: "gitlab"
+ = paginate @assignable_runners, theme: "gitlab", :params => { :anchor => '#js-runners-settings' }
diff --git a/changelogs/unreleased/42754-runners-pagination.yml b/changelogs/unreleased/42754-runners-pagination.yml
new file mode 100644
index 00000000000..8e77b857538
--- /dev/null
+++ b/changelogs/unreleased/42754-runners-pagination.yml
@@ -0,0 +1,5 @@
+---
+title: Does not collapse runners section when using pagination
+merge_request:
+author:
+type: fixed