diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 15:08:16 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 15:08:16 +0000 |
| commit | e80e0dd64fbb04f60394cb1bb08e17dbcb22b8ce (patch) | |
| tree | 9e538341b9b77e96737964813e10235dbecf47ff /app/models/member.rb | |
| parent | ef31adeb0fb9a02b2c6a4529ec4e38d7082a4b2b (diff) | |
| download | gitlab-ce-e80e0dd64fbb04f60394cb1bb08e17dbcb22b8ce.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/member.rb')
| -rw-r--r-- | app/models/member.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/member.rb b/app/models/member.rb index a87efdf63ff..5aa5655fc4a 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -468,6 +468,7 @@ class Member < ApplicationRecord # for a Member to be commited before attempting to update the highest role. # rubocop: disable CodeReuse/ServiceClass def update_highest_role + return unless Feature.enabled?(:highest_role_callback) return unless user_id.present? return unless previous_changes[:access_level].present? |