diff options
author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-12-10 18:21:43 +0000 |
---|---|---|
committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-12-10 18:21:43 +0000 |
commit | 50f4484eb9b67b582572cfffae697d277122d168 (patch) | |
tree | 6ddb6d86f50fe05945e0caf5aac7cf62682c4188 | |
parent | 0330bd0a0a646da26b7cc5d16a00c763d82b8649 (diff) | |
parent | 63af04cacf5e2f2d8446b2dc5367b415884921a6 (diff) | |
download | gitlab-ce-50f4484eb9b67b582572cfffae697d277122d168.tar.gz |
Merge remote-tracking branch 'dev/12-5-stable' into 12-5-stable
-rw-r--r-- | CHANGELOG.md | 4 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | app/services/groups/transfer_service.rb | 15 |
3 files changed, 19 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index bd3dab0a3a2..fc4868481b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 12.5.4 + +- No changes. + ## 12.5.3 ### Fixed (4 changes) @@ -1 +1 @@ -12.5.3-ee +12.5.4 diff --git a/app/services/groups/transfer_service.rb b/app/services/groups/transfer_service.rb index 24813f6ddf9..4e7875e0491 100644 --- a/app/services/groups/transfer_service.rb +++ b/app/services/groups/transfer_service.rb @@ -39,9 +39,15 @@ module Groups ensure_ownership end + post_update_hooks(@updated_project_ids) + true end + # Overridden in EE + def post_update_hooks(updated_project_ids) + end + def ensure_allowed_transfer raise_transfer_error(:group_is_already_root) if group_is_already_root? raise_transfer_error(:same_parent_as_current) if same_parent? @@ -96,9 +102,16 @@ module Groups .where(id: descendants.select(:id)) .update_all(visibility_level: @new_parent_group.visibility_level) - @group + projects_to_update = @group .all_projects .where("visibility_level > ?", @new_parent_group.visibility_level) + + # Used in post_update_hooks in EE. Must use pluck (and not select) + # here as after we perform the update below we won't be able to find + # these records again. + @updated_project_ids = projects_to_update.pluck(:id) + + projects_to_update .update_all(visibility_level: @new_parent_group.visibility_level) end # rubocop: enable CodeReuse/ActiveRecord |