diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-18 14:02:45 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-18 14:02:45 +0000 |
| commit | 80f61b4035607d7cd87de993b8f5e996bde3481f (patch) | |
| tree | 06b12f51e97d87192e3dd0e05edf55143645b894 /app/services/users | |
| parent | 4ab54c2233e91f60a80e5b6fa2181e6899fdcc3e (diff) | |
| download | gitlab-ce-80f61b4035607d7cd87de993b8f5e996bde3481f.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/users')
| -rw-r--r-- | app/services/users/update_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/users/update_service.rb b/app/services/users/update_service.rb index eea5ff6e5db..422c8ed6575 100644 --- a/app/services/users/update_service.rb +++ b/app/services/users/update_service.rb @@ -57,7 +57,7 @@ module Users params.reject! { |key, _| read_only.include?(key.to_sym) } end - @user.assign_attributes(params.except(*identity_attributes)) unless params.empty? # rubocop: disable CodeReuse/ActiveRecord + @user.assign_attributes(params.except(*identity_attributes)) unless params.empty? end def assign_identity |