Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakuya Noguchi <takninnovationresearch@gmail.com>2017-11-12 11:46:53 +0300
committerTakuya Noguchi <takninnovationresearch@gmail.com>2017-11-12 12:00:04 +0300
commitadac106fb60467ea9d0ed33c9b157c2ffa47816c (patch)
treefba8847468792f3ac1c47b9414ae5a6fb8038452
parenta978e9b98d88837f90eb856b8bb10e3dfbccd712 (diff)
Revert a regression on runners sorting (!15134)
-rw-r--r--app/views/admin/runners/index.html.haml2
-rw-r--r--changelogs/unreleased/40068-runner-sorting-regression.yml5
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