summaryrefslogtreecommitdiff
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-26 09:07:52 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-26 09:07:52 +0000
commit7e019504f5ac6decde690565857238e7e59aa034 (patch)
treefab8832b40e25fc9bc1ae54b9303b95ea146b5d5 /app/models/user.rb
parent116d4e56e83a1f408afe710ce070e699ba206475 (diff)
downloadgitlab-ce-7e019504f5ac6decde690565857238e7e59aa034.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 090d033f80c..9fb3c47e143 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1694,6 +1694,11 @@ class User < ApplicationRecord
end
end
+ # Load the current highest access by looking directly at the user's memberships
+ def current_highest_access_level
+ members.non_request.maximum(:access_level)
+ end
+
protected
# override, from Devise::Validatable