kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

replace `is_team_member?` with `team_member?`

This commit is contained in:
Maxim Rydkin 2017-08-24 20:06:04 +03:00
parent fa030cbc85
commit eb0a17ba4b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/policies/project_policy.rb
View File

@ -17,13 +17,13 @@ class ProjectPolicy < BasePolicy
desc "Project has public builds enabled" desc "Project has public builds enabled"
condition(:public_builds, scope: :subject) { project.public_builds? } condition(:public_builds, scope: :subject) { project.public_builds? }
# For guest access we use #is_team_member? so we can use # For guest access we use #team_member? so we can use
# project.members, which gets cached in subject scope. # project.members, which gets cached in subject scope.
# This is safe because team_access_level is guaranteed # This is safe because team_access_level is guaranteed
# by ProjectAuthorization's validation to be at minimum # by ProjectAuthorization's validation to be at minimum
# GUEST # GUEST
desc "User has guest access" desc "User has guest access"
condition(:guest) { is_team_member? } condition(:guest) { team_member? }
desc "User has reporter access" desc "User has reporter access"
condition(:reporter) { team_access_level >= Gitlab::Access::REPORTER } condition(:reporter) { team_access_level >= Gitlab::Access::REPORTER }
@ -293,7 +293,7 @@ class ProjectPolicy < BasePolicy
private private
def is_team_member? def team_member?
return false if @user.nil? return false if @user.nil?
greedy_load_subject = false greedy_load_subject = false