diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-14 09:11:52 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-14 09:11:52 +0300 |
| commit | f68755eb58d59ffdd9fa5e0aff2e530c7e88298d (patch) | |
| tree | 7a54889a275d81cb615a6e98619d36e9f1324299 /app/models | |
| parent | 6d79f3f0c590c8e7ff6da63e46cbe9370d64bbcc (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -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 80a875fc04d..77e283044ea 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -523,6 +523,7 @@ class Member < ApplicationRecord def validate_access_level_locked_for_member_role return unless member_role_id + return if member_role_changed? # it is ok to change the access level when changing member role if access_level_changed? errors.add(:access_level, _("cannot be changed since member is associated with a custom role")) |