diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 03:08:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 03:08:11 +0300 |
| commit | 93dcf45d441bc884b167f4338380c8c888e9b86f (patch) | |
| tree | f55e8c1d39013380d1ff7d2a4e3cca537a35192a /app/services | |
| parent | 0e68afab211a172b862a7acc774e1eda5da8e471 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/users/update_service.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/services/users/update_service.rb b/app/services/users/update_service.rb index f0e9f2b7656..b69720eefd6 100644 --- a/app/services/users/update_service.rb +++ b/app/services/users/update_service.rb @@ -60,11 +60,7 @@ module Users end def discard_read_only_attributes - if Feature.enabled?(:ldap_readonly_attributes, default_enabled: true) - params.reject! { |key, _| @user.read_only_attribute?(key.to_sym) } - else - discard_synced_attributes - end + discard_synced_attributes end def discard_synced_attributes |