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 (cherry picked from commit c8d594e0) adac106f Revert a regression on runners sorting (!15134)

Merge branch '40068-runner-sorting-regression' into 'master'
da4059b7 · Annabel Dunstone Gray · Winnie Hellmann · 6dfcafeb · da4059b7 · da4059b7
Commit da4059b7 authored Nov 13, 2017 by Annabel Dunstone Gray Committed by Winnie Hellmann Nov 15, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

index.html.haml app/views/admin/runners/index.html.haml +1 -1

40068-runner-sorting-regression.yml changelogs/unreleased/40068-runner-sorting-regression.yml +5 -0

No files found.
--- 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|

--- a/changelogs/unreleased/40068-runner-sorting-regression.yml
+++ b/changelogs/unreleased/40068-runner-sorting-regression.yml
+---
+title: Revert a regression on runners sorting (!15134)
+merge_request: 15341
+author: Takuya Noguchi
+type: fixed