diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-12 00:10:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-12 00:10:21 +0300 |
| commit | 0ae8428c8e77d5d7e098827be688b1f146321af1 (patch) | |
| tree | cfc80aac796be0dd42ce32a1bd79c8327071993d /app/models/members | |
| parent | f020d5dc9bf42fe27b1451af34e7ab3a0c38d344 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/members')
| -rw-r--r-- | app/models/members/group_member.rb | 2 | ||||
| -rw-r--r-- | app/models/members/project_member.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/members/group_member.rb b/app/models/members/group_member.rb index 0f9fdd230ff..b22a4fa9ef6 100644 --- a/app/models/members/group_member.rb +++ b/app/models/members/group_member.rb @@ -101,4 +101,4 @@ class GroupMember < Member end end -GroupMember.prepend_if_ee('EE::GroupMember') +GroupMember.prepend_mod_with('GroupMember') diff --git a/app/models/members/project_member.rb b/app/models/members/project_member.rb index 484237a6dec..41ecc4cbf01 100644 --- a/app/models/members/project_member.rb +++ b/app/models/members/project_member.rb @@ -154,4 +154,4 @@ class ProjectMember < Member # rubocop: enable CodeReuse/ServiceClass end -ProjectMember.prepend_if_ee('EE::ProjectMember') +ProjectMember.prepend_mod_with('ProjectMember') |