diff options
author | Robert Speicher <rspeicher@gmail.com> | 2019-05-07 21:03:39 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2019-05-07 21:03:39 +0000 |
commit | f2dbf1cace426f9fd9aed01a4a65eb369b2bc5e6 (patch) | |
tree | 24843825b52072013746295d5519d5340b714366 /app/policies | |
parent | 0658ebf7261da95b2e3a48364e34869af7e02e04 (diff) | |
parent | 651cfd08abe10a4bf33962a8e820aa4ed404fb46 (diff) | |
download | gitlab-ce-f2dbf1cace426f9fd9aed01a4a65eb369b2bc5e6.tar.gz |
Merge branch 'ce-jej/group-saml-sso-enforcement' into 'master'
CE changes for SSO web enforcement
See merge request gitlab-org/gitlab-ce!28141
Diffstat (limited to 'app/policies')
-rw-r--r-- | app/policies/group_policy.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/policies/group_policy.rb b/app/policies/group_policy.rb index eb2e536e8e9..ea86858181d 100644 --- a/app/policies/group_policy.rb +++ b/app/policies/group_policy.rb @@ -129,6 +129,10 @@ class GroupPolicy < BasePolicy def access_level return GroupMember::NO_ACCESS if @user.nil? - @access_level ||= @subject.max_member_access_for_user(@user) + @access_level ||= lookup_access_level! + end + + def lookup_access_level! + @subject.max_member_access_for_user(@user) end end |