diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-23 12:09:47 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-23 12:09:47 +0000 |
commit | 8f9beefac3774b30e911fb00a68f4c7a5244cf27 (patch) | |
tree | 919c3a043f8c10bc3f78f3f6e029acfb6b972556 /app/models/group.rb | |
parent | e4bf776a8829e5186a0f63603c0be627b891d80e (diff) | |
download | gitlab-ce-8f9beefac3774b30e911fb00a68f4c7a5244cf27.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/group.rb')
-rw-r--r-- | app/models/group.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/app/models/group.rb b/app/models/group.rb index e9b3e3c3369..da69f7cc11e 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -245,9 +245,6 @@ class Group < Namespace add_user(user, :maintainer, current_user: current_user) end - # @deprecated - alias_method :add_master, :add_maintainer - def add_owner(user, current_user = nil) add_user(user, :owner, current_user: current_user) end @@ -274,9 +271,6 @@ class Group < Namespace ::ContainerRepository.for_group_and_its_subgroups(self).exists? end - # @deprecated - alias_method :has_master?, :has_maintainer? - # Check if user is a last owner of the group. def last_owner?(user) has_owner?(user) && members_with_parents.owners.size == 1 |