diff options
Diffstat (limited to 'app/finders/ci/runners_finder.rb')
| -rw-r--r-- | app/finders/ci/runners_finder.rb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/app/finders/ci/runners_finder.rb b/app/finders/ci/runners_finder.rb index 3ebf6bd1562..356915722fe 100644 --- a/app/finders/ci/runners_finder.rb +++ b/app/finders/ci/runners_finder.rb @@ -4,7 +4,7 @@ module Ci class RunnersFinder < UnionFinder include Gitlab::Allowable - ALLOWED_SORTS = %w[contacted_asc contacted_desc created_at_asc created_at_desc created_date].freeze + ALLOWED_SORTS = %w[contacted_asc contacted_desc created_at_asc created_at_desc created_date token_expires_at_asc token_expires_at_desc].freeze DEFAULT_SORT = 'created_at_desc' def initialize(current_user:, params:) @@ -53,13 +53,7 @@ module Ci when :direct Ci::Runner.belonging_to_group(@group.id) when :descendants, nil - if ::Feature.enabled?(:ci_find_runners_by_ci_mirrors, @group, default_enabled: :yaml) - Ci::Runner.belonging_to_group_or_project_descendants(@group.id) - else - # Getting all runners from the group itself and all its descendant groups/projects - descendant_projects = Project.for_group_and_its_subgroups(@group) - Ci::Runner.legacy_belonging_to_group_or_project(@group.self_and_descendants, descendant_projects) - end + Ci::Runner.belonging_to_group_or_project_descendants(@group.id) else raise ArgumentError, 'Invalid membership filter' end |