Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/preloaders')
-rw-r--r--app/models/preloaders/project_root_ancestor_preloader.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/preloaders/project_root_ancestor_preloader.rb b/app/models/preloaders/project_root_ancestor_preloader.rb
index 1e96e139f94..9baa469e60d 100644
--- a/app/models/preloaders/project_root_ancestor_preloader.rb
+++ b/app/models/preloaders/project_root_ancestor_preloader.rb
@@ -12,7 +12,7 @@ module Preloaders
return unless @projects.is_a?(ActiveRecord::Relation)
root_query = Namespace.joins("INNER JOIN (#{join_sql}) as root_query ON root_query.root_id = namespaces.id")
- .select('namespaces.*, root_query.id as source_id')
+ .select('namespaces.*, root_query.project_id as source_id')
root_query = root_query.preload(*@root_ancestor_preloads) if @root_ancestor_preloads.any?
@@ -30,7 +30,7 @@ module Preloaders
def join_sql
@projects
.joins(@namespace_sti_name)
- .select('projects.id, namespaces.traversal_ids[1] as root_id')
+ .select('projects.id as project_id, namespaces.traversal_ids[1] as root_id')
.to_sql
end
end