diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-23 15:09:47 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-23 15:09:47 +0300 |
commit | 8f9beefac3774b30e911fb00a68f4c7a5244cf27 (patch) | |
tree | 919c3a043f8c10bc3f78f3f6e029acfb6b972556 /app/models/project_team.rb | |
parent | e4bf776a8829e5186a0f63603c0be627b891d80e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/project_team.rb')
-rw-r--r-- | app/models/project_team.rb | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/app/models/project_team.rb b/app/models/project_team.rb index de1fc55ba93..072d281e5f8 100644 --- a/app/models/project_team.rb +++ b/app/models/project_team.rb @@ -25,9 +25,6 @@ class ProjectTeam add_user(user, :maintainer, current_user: current_user) end - # @deprecated - alias_method :add_master, :add_maintainer - def add_role(user, role, current_user: nil) public_send(:"add_#{role}", user, current_user: current_user) # rubocop:disable GitlabSecurity/PublicSend end @@ -98,9 +95,6 @@ class ProjectTeam @maintainers ||= fetch_members(Gitlab::Access::MAINTAINER) end - # @deprecated - alias_method :masters, :maintainers - def owners @owners ||= if group @@ -156,9 +150,6 @@ class ProjectTeam max_member_access(user.id) == Gitlab::Access::MAINTAINER end - # @deprecated - alias_method :master?, :maintainer? - # Checks if `user` is authorized for this project, with at least the # `min_access_level` (if given). def member?(user, min_access_level = Gitlab::Access::GUEST) |