Skip to content
Snippets Groups Projects

Include and process visibility_level

Merged Carla Drago requested to merge 405168-fix-group-visibility-level into master
1 unresolved thread
1 file
+ 5
1
Compare changes
  • Side-by-side
  • Inline
@@ -65,7 +65,11 @@ def process_root(group_id)
@@ -65,7 +65,11 @@ def process_root(group_id)
# with existing groups name and/or path.
# with existing groups name and/or path.
group_attributes.delete_attributes('name', 'path')
group_attributes.delete_attributes('name', 'path')
unless @top_level_group.parent.nil?
if @top_level_group.parent.nil?
 
if Gitlab::VisibilityLevel.restricted_level?(group_attributes.attributes['visibility_level'])
 
group_attributes.delete_attribute('visibility_level')
 
end
 
else
group_attributes.attributes['visibility_level'] = sub_group_visibility_level(
group_attributes.attributes['visibility_level'] = sub_group_visibility_level(
group_attributes.attributes,
group_attributes.attributes,
@top_level_group.parent
@top_level_group.parent
@@ -103,0+107,0 @@
@@ -103,0+107,0 @@
parent_id: parent_group.id,
parent_id: parent_group.id,
visibility_level: sub_group_visibility_level(group_attributes.attributes, parent_group)
visibility_level: sub_group_visibility_level(group_attributes.attributes, parent_group)
).execute
).execute
group.validate!
group.validate!
group
group
Loading