diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-11-13 17:01:36 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-11-13 17:01:36 +0000 |
| commit | c8d594e04e2d12a1c0d68ed80998f0b42f0fc8c5 (patch) | |
| tree | 1bd0c1c309f8387e4b1dfde98162d4aa7a2c0c86 | |
| parent | 9200b500125d15a56d10e66c9bcd78943e4386b1 (diff) | |
| parent | adac106fb60467ea9d0ed33c9b157c2ffa47816c (diff) | |
| download | gitlab-ce-c8d594e04e2d12a1c0d68ed80998f0b42f0fc8c5.tar.gz | |
Merge branch '40068-runner-sorting-regression' into 'master'
Revert a regression on runners sorting (!15134)
Closes #40068
See merge request gitlab-org/gitlab-ce!15341
| -rw-r--r-- | app/views/admin/runners/index.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/40068-runner-sorting-regression.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml index 4965dffab9d..4f60be698e9 100644 --- a/app/views/admin/runners/index.html.haml +++ b/app/views/admin/runners/index.html.haml @@ -64,7 +64,7 @@ %th Projects %th Jobs %th Tags - %th Last contact + %th= link_to 'Last contact', admin_runners_path(params.slice(:search).merge(sort: 'contacted_asc')) %th - @runners.each do |runner| diff --git a/changelogs/unreleased/40068-runner-sorting-regression.yml b/changelogs/unreleased/40068-runner-sorting-regression.yml new file mode 100644 index 00000000000..6a2bd59d6d6 --- /dev/null +++ b/changelogs/unreleased/40068-runner-sorting-regression.yml @@ -0,0 +1,5 @@ +--- +title: Revert a regression on runners sorting (!15134) +merge_request: 15341 +author: Takuya Noguchi +type: fixed |