summaryrefslogtreecommitdiff
path: root/app/finders
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2018-09-14 15:05:46 +0200
committerYorick Peterse <yorickpeterse@gmail.com>2018-09-14 15:05:46 +0200
commitf0e7b5e7a321383aa847790d36b1328a70c2fe2c (patch)
treea0cabd59ae9d81f5401235ede383dbc39b2fba78 /app/finders
parent197beefc414c34ba9af89b91630f5d3137bf06de (diff)
downloadgitlab-ce-f0e7b5e7a321383aa847790d36b1328a70c2fe2c.tar.gz
Cleaned up CI runner administration code
In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19625 some changes were introduced that do not meet our abstraction reuse rules. This commit cleans up some of these changes so the requirements are met. Most notably, sorting of the runners in Admin::RunnersFinder has been delegated to Ci::Runner.order_by, similar to how we order data in models that include the Sortable module. If we need more sort orders in the future we can include Sortable and have Ci::Runner.order_by call `super` to delegate to Sortable.order_by.
Diffstat (limited to 'app/finders')
-rw-r--r--app/finders/admin/runners_finder.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/finders/admin/runners_finder.rb b/app/finders/admin/runners_finder.rb
index 7adee486e33..3c2d7ee7d76 100644
--- a/app/finders/admin/runners_finder.rb
+++ b/app/finders/admin/runners_finder.rb
@@ -43,8 +43,7 @@ class Admin::RunnersFinder < UnionFinder
end
def sort!
- sort = sort_key == 'contacted_asc' ? { contacted_at: :asc } : { created_at: :desc }
- @runners = @runners.order(sort)
+ @runners = @runners.order_by(sort_key)
end
def paginate!