diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-16 09:08:46 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-16 09:08:46 +0000 |
commit | b806264d29b8d52ccb78a41dcc3d67f2b040700c (patch) | |
tree | af97e9d36b2c82520d6850836dee6ba8d7ed9b17 /app/services/users | |
parent | 34ab9be97ecf84dd2b7a3b8f3149c0f7d1d7ab5c (diff) | |
download | gitlab-ce-b806264d29b8d52ccb78a41dcc3d67f2b040700c.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 | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/app/services/users/update_service.rb b/app/services/users/update_service.rb index dfbb65b7fcf..e7667b0ca18 100644 --- a/app/services/users/update_service.rb +++ b/app/services/users/update_service.rb @@ -54,7 +54,6 @@ module Users def discard_read_only_attributes discard_synced_attributes - discard_name unless name_updatable? end def discard_synced_attributes @@ -65,14 +64,6 @@ module Users end end - def discard_name - params.delete(:name) - end - - def name_updatable? - can?(current_user, :update_name, @user) - end - def assign_attributes @user.assign_attributes(params.except(*identity_attributes)) unless params.empty? end |