summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-11-13 17:01:36 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-11-13 17:01:36 +0000
commitc8d594e04e2d12a1c0d68ed80998f0b42f0fc8c5 (patch)
tree1bd0c1c309f8387e4b1dfde98162d4aa7a2c0c86 /app
parent9200b500125d15a56d10e66c9bcd78943e4386b1 (diff)
parentadac106fb60467ea9d0ed33c9b157c2ffa47816c (diff)
downloadgitlab-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
Diffstat (limited to 'app')
-rw-r--r--app/views/admin/runners/index.html.haml2
1 files changed, 1 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|