summaryrefslogtreecommitdiff
path: root/app/policies
diff options
context:
space:
mode:
authorJames Edwards-Jones <jedwardsjones@gitlab.com>2019-05-06 23:18:03 +0700
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2019-05-06 23:28:27 +0700
commit651cfd08abe10a4bf33962a8e820aa4ed404fb46 (patch)
tree83af222ac2b682fe0653eadb87eec7561bfcc9fc /app/policies
parent8b55b794cb48c726cde7cf0ad24180d8e6bb975f (diff)
downloadgitlab-ce-651cfd08abe10a4bf33962a8e820aa4ed404fb46.tar.gz
CE changes for SSO web enforcementce-jej/group-saml-sso-enforcement
Adds two methods for us to extend in EE: - OmniauthCallbacksController#link_identity - GroupPolicy#lookup_access_level!
Diffstat (limited to 'app/policies')
-rw-r--r--app/policies/group_policy.rb6
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