diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-13 16:26:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-13 16:26:31 +0300 |
| commit | b7dfe2ae4054aa40e15182fd3c6cb7dd39f131db (patch) | |
| tree | 5ab080ca9cadeb6cd9578bf301e4e9e8810bed9e /app/models/members | |
| parent | 25cb337cf12438169f1b14bc5dace8a06a7356e3 (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, 4 insertions, 0 deletions
diff --git a/app/models/members/group_member.rb b/app/models/members/group_member.rb index ed5832ff989..bdff9e28df1 100644 --- a/app/models/members/group_member.rb +++ b/app/models/members/group_member.rb @@ -76,3 +76,5 @@ class GroupMember < Member super end end + +GroupMember.prepend_if_ee('EE::GroupMember') diff --git a/app/models/members/project_member.rb b/app/models/members/project_member.rb index 2bb5806cd21..68c51860c47 100644 --- a/app/models/members/project_member.rb +++ b/app/models/members/project_member.rb @@ -146,3 +146,5 @@ class ProjectMember < Member end # rubocop: enable CodeReuse/ServiceClass end + +ProjectMember.prepend_if_ee('EE::ProjectMember') |