diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 15:09:39 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 15:09:39 +0000 |
commit | dc889678d1de8c09310b2f8f9742bb6c78a6f1a4 (patch) | |
tree | 70945aa6721a271fc8057efa13c3216a03fbac45 /app/models/user.rb | |
parent | cd52759ee33051b8ad7b88b02ba7954e4fad7018 (diff) | |
download | gitlab-ce-dc889678d1de8c09310b2f8f9742bb6c78a6f1a4.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/user.rb')
-rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index b0db21b2d1c..d1a30c6a5c8 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1562,7 +1562,7 @@ class User < ApplicationRecord def read_only_attribute?(attribute) if Feature.enabled?(:ldap_readonly_attributes, default_enabled: true) - enabled = Gitlab::Auth::LDAP::Config.enabled? + enabled = Gitlab::Auth::Ldap::Config.enabled? read_only = attribute.to_sym.in?(UserSyncedAttributesMetadata::SYNCABLE_ATTRIBUTES) return true if enabled && read_only |