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:
authorAhmad Sherif <me@ahmadsherif.com>2016-11-18 20:15:47 +0300
committerAhmad Sherif <me@ahmadsherif.com>2016-11-23 13:57:58 +0300
commit916332815e33c655f727a28457f655f6425306ae (patch)
tree8d8166e3a6cbcacb2abd7ca5182639e87d8589b1 /app/models/project_team.rb
parent229b7e9a8e10d51eca057e7948a48935011cc51a (diff)
Drop Project#authorized_for_user? in favor of ProjectTeam#member?
Closes #23938
Diffstat (limited to 'app/models/project_team.rb')
-rw-r--r--app/models/project_team.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/models/project_team.rb b/app/models/project_team.rb
index 65549d8cd08..5845203055a 100644
--- a/app/models/project_team.rb
+++ b/app/models/project_team.rb
@@ -141,8 +141,12 @@ class ProjectTeam
max_member_access(user.id) == Gitlab::Access::MASTER
end
- def member?(user, min_member_access = Gitlab::Access::GUEST)
- max_member_access(user.id) >= min_member_access
+ # 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)
+ return false unless user
+
+ user.authorized_project?(project, min_access_level)
end
def human_max_access(user_id)