diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-08-16 09:43:50 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-08-16 09:59:25 -0700 |
| commit | fddff2c411a2791ef7641032228c4390e444eeee (patch) | |
| tree | 104d5ed11d63bc169dd5869b56131cbb317c5bc7 | |
| parent | e6c0f6b0ce0c7de1bcd2e133ecb8c973a6642bf6 (diff) | |
| download | gitlab-ce-sh-fix-arel-deprecation-join.tar.gz | |
Fix Arel deprecation warning in clusters_hierarchysh-fix-arel-deprecation-join
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
| -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 |