Fix GeoNode#projects query for selective sync

295e3bf8 · Douglas Barbosa Alexandre · 17e7f5ba · 295e3bf8
Commit 295e3bf8 authored Dec 04, 2017 by Douglas Barbosa Alexandre
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

app/models/geo_node.rb app/models/geo_node.rb +1 -2

No files found.
--- a/app/models/geo_node.rb
+++ b/app/models/geo_node.rb
@@ -135,8 +135,7 @@ class GeoNode < ActiveRecord::Base
    if selective_sync?
      relations = namespaces.map { |namespace| namespace.all_projects.select(:id) }
-      Project.unscoped
+      Project.where("id IN (#{Gitlab::SQL::Union.new(relations).to_sql})")
-        .from("(#{Gitlab::SQL::Union.new(relations).to_sql}) #{Project.table_name}")
    else
      Project.all
    end