Fix Arel deprecation warning in clusters_hierarchy
As mentioned in https://github.com/rails/rails/pull/29619, this removes this warning message: ``` Delegating join_sources to arel is deprecated and will be removed in Rails 6.0. (called from project_clusters_base_query at app/models/clusters/clusters_hierarchy.rb:62) ``` Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/61451
This commit is contained in:
parent
e6c0f6b0ce
commit
fddff2c411
1 changed files with 2 additions and 2 deletions
|
@ -46,7 +46,7 @@ module Clusters
|
||||||
|
|
||||||
def group_clusters_base_query
|
def group_clusters_base_query
|
||||||
group_parent_id_alias = alias_as_column(groups[:parent_id], 'group_parent_id')
|
group_parent_id_alias = alias_as_column(groups[:parent_id], 'group_parent_id')
|
||||||
join_sources = ::Group.left_joins(:clusters).join_sources
|
join_sources = ::Group.left_joins(:clusters).arel.join_sources
|
||||||
|
|
||||||
model
|
model
|
||||||
.unscoped
|
.unscoped
|
||||||
|
@ -59,7 +59,7 @@ module Clusters
|
||||||
def project_clusters_base_query
|
def project_clusters_base_query
|
||||||
projects = ::Project.arel_table
|
projects = ::Project.arel_table
|
||||||
project_parent_id_alias = alias_as_column(projects[:namespace_id], 'group_parent_id')
|
project_parent_id_alias = alias_as_column(projects[:namespace_id], 'group_parent_id')
|
||||||
join_sources = ::Project.left_joins(:clusters).join_sources
|
join_sources = ::Project.left_joins(:clusters).arel.join_sources
|
||||||
|
|
||||||
model
|
model
|
||||||
.unscoped
|
.unscoped
|
||||||
|
|
Loading…
Reference in a new issue