diff options
| author | James Lopez <james@jameslopez.es> | 2017-09-27 11:48:33 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2017-09-28 08:46:39 +0200 |
| commit | 67d06dee30379fc93be196e2cf509660d1661aea (patch) | |
| tree | de02bb9866dcc70cc7e65f9599bc7e8392060775 /lib/api/users.rb | |
| parent | cbb90d8f84d1f79560066d8ea3c6346906e7da94 (diff) | |
| download | gitlab-ce-67d06dee30379fc93be196e2cf509660d1661aea.tar.gz | |
refactor users update service
Diffstat (limited to 'lib/api/users.rb')
| -rw-r--r-- | lib/api/users.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb index b157940eaa6..ce5d75965d5 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -166,7 +166,7 @@ module API user_params[:password_expires_at] = Time.now if user_params[:password].present? - result = ::Users::UpdateService.new(current_user, user, user_params.except(:extern_uid, :provider)).execute + result = ::Users::UpdateService.new(current_user, user_params.except(:extern_uid, :provider).merge(user: user)).execute if result[:status] == :success present user, with: Entities::UserPublic |