summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-05-09 15:45:32 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-05-14 16:31:02 +0000
commiteb5e3cf307eede4d0272aa5aa26e93bc8a05153f (patch)
tree4aead883704b2a81f01b021d4aee6181d86fe95b
parent3a06e0ea5e5c2d9630bd043c94b95e5055737de3 (diff)
downloadgitlab-ce-eb5e3cf307eede4d0272aa5aa26e93bc8a05153f.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 (cherry picked from commit 1a90a9bb09138969c784aaf5395456ceaa3e5d89) b95a0690 SSO enforcement for project resources
-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