diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-12 18:09:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-12 18:09:58 +0300 |
| commit | dc250651ab26bf7bce9205d5fa4a45dd58e2df81 (patch) | |
| tree | 5d20546877fcc4f36897d4efebb96859e488f1b9 /app/models/namespaces/traversal/linear.rb | |
| parent | 2fe5ea34a5f63661a050404d3b5fbe3056a39765 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/namespaces/traversal/linear.rb')
| -rw-r--r-- | app/models/namespaces/traversal/linear.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/models/namespaces/traversal/linear.rb b/app/models/namespaces/traversal/linear.rb index 3216ec42427..081e51c1028 100644 --- a/app/models/namespaces/traversal/linear.rb +++ b/app/models/namespaces/traversal/linear.rb @@ -178,10 +178,6 @@ module Namespaces depth_sql = "ABS(#{traversal_ids.count} - array_length(traversal_ids, 1))" skope = skope.select(skope.arel_table[Arel.star], "#{depth_sql} as depth") .order(depth: hierarchy_order) - # The SELECT includes an extra depth attribute. We then wrap the SQL - # in a standard SELECT to avoid mismatched attribute errors when - # trying to chain future ActiveRelation commands. - skope = self.class.without_sti_condition.from(skope, self.class.table_name) end skope |