Commit 1a90a9bb authored by Nick Thomas's avatar Nick Thomas

Merge branch 'ce-jej/group-saml-project-enforcement' into 'master'

CE Changes for SSO enforcement in ProjectPolicy

See merge request gitlab-org/gitlab-ce!28208
parents 84f908fb b95a0690
...@@ -488,6 +488,10 @@ class ProjectPolicy < BasePolicy ...@@ -488,6 +488,10 @@ class ProjectPolicy < BasePolicy
def team_access_level def team_access_level
return -1 if @user.nil? return -1 if @user.nil?
lookup_access_level!
end
def lookup_access_level!
# NOTE: max_member_access has its own cache # NOTE: max_member_access has its own cache
project.team.max_member_access(@user.id) project.team.max_member_access(@user.id)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment