Merge branch '38720-sort-admin-runners' into 'master'

app/controllers/admin/runners_controller.rb

@@ -2,7 +2,8 @@ class Admin::RunnersController < Admin::ApplicationController
   before_action :runner, except: :index
 
   def index
-    @runners = Ci::Runner.order('id DESC')
+    sort = params[:sort] == 'contacted_asc' ? { contacted_at: :asc } : { id: :desc }
+    @runners = Ci::Runner.order(sort)
     @runners = @runners.search(params[:search]) if params[:search].present?
     @runners = @runners.page(params[:page]).per(30)
     @active_runners_cnt = Ci::Runner.online.count

app/views/admin/runners/index.html.haml

@@ -63,7 +63,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|

changelogs/unreleased/38720-sort-admin-runners.yml

+---
+title: Add sort runners on admin runners
+merge_request: 14661
+author: Takuya Noguchi
+type: added