diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-04 15:08:40 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-04 15:08:40 +0000 |
| commit | 6b833f1e0340e00fdee074da9c42c0d4e07a46d2 (patch) | |
| tree | 6fc3a7a2f8a02fec8d1e7561b453d33eb4048dad /app/models/user.rb | |
| parent | 88a0824944720b6edaaef56376713541b9a02118 (diff) | |
| download | gitlab-ce-6b833f1e0340e00fdee074da9c42c0d4e07a46d2.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index bc113c72762..d44e8162abe 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1527,6 +1527,13 @@ class User < ApplicationRecord end def read_only_attribute?(attribute) + if Feature.enabled?(:ldap_readonly_attributes, default_enabled: true) + enabled = Gitlab::Auth::LDAP::Config.enabled? + read_only = attribute.to_sym.in?(UserSyncedAttributesMetadata::SYNCABLE_ATTRIBUTES) + + return true if enabled && read_only + end + user_synced_attributes_metadata&.read_only?(attribute) end |