diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-25 15:12:32 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-25 15:12:32 +0000 |
| commit | 7d8d5a3dab415672a41ab29c3bfa9581f275dc50 (patch) | |
| tree | 7b9249d8ca8c12ad899b4e6d968193d58e63f458 /app/models/ci/namespace_mirror.rb | |
| parent | 868c8c35fbddd439f4df76a5954e2a1caa2af3cc (diff) | |
| download | gitlab-ce-7d8d5a3dab415672a41ab29c3bfa9581f275dc50.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/ci/namespace_mirror.rb')
| -rw-r--r-- | app/models/ci/namespace_mirror.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/ci/namespace_mirror.rb b/app/models/ci/namespace_mirror.rb index ce3faf3546b..d5cbbb96134 100644 --- a/app/models/ci/namespace_mirror.rb +++ b/app/models/ci/namespace_mirror.rb @@ -6,7 +6,7 @@ module Ci class NamespaceMirror < ApplicationRecord belongs_to :namespace - scope :contains_namespace, -> (id) do + scope :by_group_and_descendants, -> (id) do where('traversal_ids @> ARRAY[?]::int[]', id) end @@ -32,7 +32,7 @@ module Ci private def sync_children_namespaces!(namespace_id, traversal_ids) - contains_namespace(namespace_id) + by_group_and_descendants(namespace_id) .where.not(namespace_id: namespace_id) .update_all( "traversal_ids = ARRAY[#{sanitize_sql(traversal_ids.join(','))}]::int[] || traversal_ids[array_position(traversal_ids, #{sanitize_sql(namespace_id)}) + 1:]" |