diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-28 21:08:39 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-28 21:08:39 +0300 |
commit | e4632f4c63eae7ec36243d11b23d69b4fd880830 (patch) | |
tree | 3a8861404c8bab446f55f2f3bf523365176a8f9c /app/models/members | |
parent | 59469a17821eda8a34d08b1e46584e902d1e963a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/members')
-rw-r--r-- | app/models/members/group_member.rb | 4 | ||||
-rw-r--r-- | app/models/members/project_member.rb | 8 |
2 files changed, 1 insertions, 11 deletions
diff --git a/app/models/members/group_member.rb b/app/models/members/group_member.rb index c7bc31cde5d..ab044b80133 100644 --- a/app/models/members/group_member.rb +++ b/app/models/members/group_member.rb @@ -32,10 +32,6 @@ class GroupMember < Member Gitlab::Access.options_with_owner end - def self.access_levels - Gitlab::Access.sym_options_with_owner - end - def self.pluck_user_ids pluck(:user_id) end diff --git a/app/models/members/project_member.rb b/app/models/members/project_member.rb index 41ecc4cbf01..5040879e177 100644 --- a/app/models/members/project_member.rb +++ b/app/models/members/project_member.rb @@ -48,7 +48,7 @@ class ProjectMember < Member project_ids.each do |project_id| project = Project.find(project_id) - add_users( + Members::Projects::CreatorService.add_users( # rubocop:todo CodeReuse/ServiceClass project, users, access_level, @@ -80,12 +80,6 @@ class ProjectMember < Member def access_level_roles Gitlab::Access.options end - - private - - def can_update_member?(current_user, member) - super || (member.owner? && member.new_record?) - end end def project |