diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-01-16 08:25:53 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-01-16 08:25:53 +0000 |
| commit | 5abdcf1be9fec29d14c1d5e7a9cc0aef2edaeff9 (patch) | |
| tree | 30e562290756778b40cb0411bd566919d4dc7a08 | |
| parent | 0de7ae34cdb06f72d5f674c056f28cd32c03bda3 (diff) | |
| parent | e1a8ced9f8c298bc297e37451d192c0edf474ac1 (diff) | |
| download | gitlab-ce-5abdcf1be9fec29d14c1d5e7a9cc0aef2edaeff9.tar.gz | |
Merge branch 'sh-remove-shared-runners-and-more' into 'master'
Remove erroneous text in shared runners page that suggested more runners available
Closes #42059
See merge request gitlab-org/gitlab-ce!16483
| -rw-r--r-- | app/views/projects/runners/_shared_runners.html.haml | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-remove-shared-runners-and-more.yml | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/views/projects/runners/_shared_runners.html.haml b/app/views/projects/runners/_shared_runners.html.haml index a4e820628f3..67607e4e9c6 100644 --- a/app/views/projects/runners/_shared_runners.html.haml +++ b/app/views/projects/runners/_shared_runners.html.haml @@ -23,6 +23,3 @@ %h4.underlined-title Available shared Runners : #{@shared_runners_count} %ul.bordered-list.available-shared-runners = render partial: 'projects/runners/runner', collection: @shared_runners, as: :runner - - if @shared_runners_count > 10 - .light - and #{@shared_runners_count - 10} more... diff --git a/changelogs/unreleased/sh-remove-shared-runners-and-more.yml b/changelogs/unreleased/sh-remove-shared-runners-and-more.yml new file mode 100644 index 00000000000..cc079617883 --- /dev/null +++ b/changelogs/unreleased/sh-remove-shared-runners-and-more.yml @@ -0,0 +1,5 @@ +--- +title: Remove erroneous text in shared runners page that suggested more runners available +merge_request: +author: +type: fixed |