diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 18:09:28 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 18:09:28 +0000 |
| commit | ce8a0b90849ac5d1895e741c023432930f24d724 (patch) | |
| tree | dbdc97de542cdbe18a2fc8b1a6b64ac0673ed3d3 /app/models/user.rb | |
| parent | dc889678d1de8c09310b2f8f9742bb6c78a6f1a4 (diff) | |
| download | gitlab-ce-ce8a0b90849ac5d1895e741c023432930f24d724.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index d1a30c6a5c8..17850d13e48 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -164,6 +164,7 @@ class User < ApplicationRecord has_one :status, class_name: 'UserStatus' has_one :user_preference has_one :user_detail + has_one :user_highest_role # # Validations |