diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-28 15:38:12 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-28 15:38:12 +0300 |
| commit | e2b92514e3def8074c0855100632ebb9935d2a19 (patch) | |
| tree | 5ddea5ed33370749e6b782dece20dc18d6a327d5 /app/finders | |
| parent | 79659fe1fe45f2bdd13cd1a3980fbf1714caad57 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/finders')
| -rw-r--r-- | app/finders/ci/runners_finder.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/finders/ci/runners_finder.rb b/app/finders/ci/runners_finder.rb index 7ad51361efd..d34b3202433 100644 --- a/app/finders/ci/runners_finder.rb +++ b/app/finders/ci/runners_finder.rb @@ -19,8 +19,9 @@ module Ci filter_by_runner_type! filter_by_tag_list! sort! + request_tag_list! - @runners.with_tags + @runners rescue Gitlab::Access::AccessDeniedError Ci::Runner.none @@ -73,6 +74,10 @@ module Ci @runners = @runners.order_by(sort_key) end + def request_tag_list! + @runners = @runners.with_tags if !@params[:preload].present? || @params.dig(:preload, :tag_name) + end + def filter_by!(scope_name, available_scopes) scope = @params[scope_name] |