use union for Project#any_runners?

d4bda7c1 · Alexis Reigel · dd785467 · d4bda7c1
Commit d4bda7c1 authored Nov 09, 2017 by Alexis Reigel
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

app/models/project.rb app/models/project.rb +3 -3

No files found.
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1324,9 +1324,9 @@ class Project < ActiveRecord::Base
  end
  def any_runners?(&block)
-    active_runners.any?(&block) ||
+    union = Gitlab::SQL::Union.new([active_runners, active_shared_runners, active_group_runners])
-      active_shared_runners.any?(&block) ||
+    runners = Ci::Runner.from("(#{union.to_sql}) ci_runners")
-      active_group_runners.any?(&block)
+    runners.any?(&block)
  end
  def valid_runners_token?(token)