diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-05 21:08:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-05 21:08:43 +0300 |
| commit | e129eff88309eca18f3902afd710e2e07393fe45 (patch) | |
| tree | 2dd9399fdcfdee719d51e63cd821adc58165ccb3 /lib/gitlab/database_importers | |
| parent | 205b6baf2677879c35968d2b659225b58e8a1227 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/database_importers')
| -rw-r--r-- | lib/gitlab/database_importers/instance_administrators/create_group.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/database_importers/instance_administrators/create_group.rb b/lib/gitlab/database_importers/instance_administrators/create_group.rb index 79244120776..bb489ced3d2 100644 --- a/lib/gitlab/database_importers/instance_administrators/create_group.rb +++ b/lib/gitlab/database_importers/instance_administrators/create_group.rb @@ -77,7 +77,7 @@ module Gitlab def add_group_members(result) group = result[:group] - members = group.add_users(members_to_add(group), Gitlab::Access::MAINTAINER) + members = group.add_members(members_to_add(group), Gitlab::Access::MAINTAINER) errors = members.flat_map { |member| member.errors.full_messages } if errors.any? @@ -112,7 +112,7 @@ module Gitlab def members_to_add(group) # Exclude admins who are already members of group because - # `group.add_users(users)` returns an error if the users parameter contains + # `group.add_members(users)` returns an error if the users parameter contains # users who are already members of the group. instance_admins - group.members.collect(&:user) end |