Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-04-18 19:53:32 +0300
committerRémy Coutable <remy@rymai.me>2016-06-14 14:07:26 +0300
commitd26f81239a33b80694783ee35f0da0e2ed082c9b (patch)
treef092e818d4b81805a16879b13407a335bbda0054 /app/models/project_team.rb
parent17c22156c5fa5663aae65178ed38cbeef9a80b7e (diff)
Add request access for groups
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/models/project_team.rb')
-rw-r--r--app/models/project_team.rb28
1 files changed, 2 insertions, 26 deletions
diff --git a/app/models/project_team.rb b/app/models/project_team.rb
index 769b73666ce..7fb17df0e96 100644
--- a/app/models/project_team.rb
+++ b/app/models/project_team.rb
@@ -21,16 +21,6 @@ class ProjectTeam
end
end
- def find(user_id)
- user = project.users.find_by(id: user_id)
-
- if group
- user ||= group.users.find_by(id: user_id)
- end
-
- user
- end
-
def find_member(user_id)
member = project.project_members.find_by(user_id: user_id)
@@ -61,13 +51,10 @@ class ProjectTeam
ProjectMember.truncate_team(project)
end
- def users
- members
- end
-
def members
@members ||= fetch_members
end
+ alias_method :users, :members
def guests
@guests ||= fetch_members(:guests)
@@ -115,12 +102,6 @@ class ProjectTeam
false
end
- def pending?(user)
- project.project_members.each do |member|
- return member.pending? if member.user_id == user.id
- end
- end
-
def guest?(user)
max_member_access(user.id) == Gitlab::Access::GUEST
end
@@ -147,10 +128,6 @@ class ProjectTeam
end
end
- def human_max_access(user_id)
- Gitlab::Access.options_with_owner.key(max_member_access(user_id))
- end
-
# This method assumes project and group members are eager loaded for optimal
# performance.
def max_member_access(user_id)
@@ -179,6 +156,7 @@ class ProjectTeam
access.compact.max
end
+ private
def max_invited_level(user_id)
project.project_group_links.map do |group_link|
@@ -195,8 +173,6 @@ class ProjectTeam
end.compact.max
end
- private
-
def fetch_members(level = nil)
project_members = project.project_members
group_members = group ? group.group_members : []