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
This commit is contained in:
Annabel Dunstone Gray 2017-11-13 17:01:36 +00:00
commit c8d594e04e
2 changed files with 6 additions and 1 deletions

View file

@ -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|

View file

@ -0,0 +1,5 @@
---
title: Revert a regression on runners sorting (!15134)
merge_request: 15341
author: Takuya Noguchi
type: fixed