summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-05-09 15:45:32 +0000
committerNick Thomas <nick@gitlab.com>2019-05-09 15:45:32 +0000
commit1a90a9bb09138969c784aaf5395456ceaa3e5d89 (patch)
tree81776bbb47559b02fcba4ef706cb25c5c19f95b5
parent84f908fbd69708cb202827eb6d56f82bc00b961c (diff)
parentb95a0690fea46a41af01bd8a09b5c00ffdfcd515 (diff)
downloadgitlab-ce-1a90a9bb09138969c784aaf5395456ceaa3e5d89.tar.gz
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
-rw-r--r--app/policies/project_policy.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb
index 76544249688..3218c04b219 100644
--- a/app/policies/project_policy.rb
+++ b/app/policies/project_policy.rb
@@ -488,6 +488,10 @@ class ProjectPolicy < BasePolicy
def team_access_level
return -1 if @user.nil?
+ lookup_access_level!
+ end
+
+ def lookup_access_level!
# NOTE: max_member_access has its own cache
project.team.max_member_access(@user.id)
end