diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2019-08-16 19:28:12 +0000 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2019-08-16 19:28:12 +0000 |
| commit | b3145bc976836f4c28a2f97a57e40b9f315aa3a4 (patch) | |
| tree | 06f0d0dc3cfeff70fe69648fda374cb43a2b063d | |
| parent | b7f191c5d025f95f5f343f43b24878c68b5c72b3 (diff) | |
| parent | fddff2c411a2791ef7641032228c4390e444eeee (diff) | |
| download | gitlab-ce-b3145bc976836f4c28a2f97a57e40b9f315aa3a4.tar.gz | |
Merge branch 'sh-fix-arel-deprecation-join' into 'master'
Fix Arel deprecation warning in clusters_hierarchy
See merge request gitlab-org/gitlab-ce!31916
| -rw-r--r-- | app/models/clusters/clusters_hierarchy.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/clusters/clusters_hierarchy.rb b/app/models/clusters/clusters_hierarchy.rb index dab034b7234..5556fc8d3f0 100644 --- a/app/models/clusters/clusters_hierarchy.rb +++ b/app/models/clusters/clusters_hierarchy.rb @@ -46,7 +46,7 @@ module Clusters def group_clusters_base_query 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 .unscoped @@ -59,7 +59,7 @@ module Clusters def project_clusters_base_query projects = ::Project.arel_table 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 .unscoped |