Use ancestors for avoiding N queries

bd846f7d · Shinya Maeda · e255e4de · bd846f7d
Commit bd846f7d authored Jul 05, 2017 by Shinya Maeda
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

app/models/group.rb app/models/group.rb +3 -4

No files found.
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -250,10 +250,9 @@ class Group < Namespace
  end
  def secret_variables_for(ref, project)
-    variables = []
+    list_of_ids = ([self] + ancestors).map { |l| l.id }
-    variables += parent.secret_variables_for(ref, project) if has_parent?
+    variables = Ci::GroupVariable.where("group_id IN (#{list_of_ids.join(", ")})")
-    variables += project.protected_for?(ref) ? self.variables : self.variables.unprotected
+    project.protected_for?(ref) ? variables : variables.unprotected
-    variables
  end
  protected