diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2017-02-06 10:54:53 +0100 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2017-02-06 10:54:53 +0100 |
| commit | 3f01f05bde8e55b533bc0468ed62485141e827e8 (patch) | |
| tree | 93d8a29b0b8f95fa7fd60d82970392c6b8a8e97a /lib/api/users.rb | |
| parent | caa7344d48080c07658331b991399cf7a86f926f (diff) | |
| parent | 572fb0be9b1d45437b7c0ed1000399657f471ec7 (diff) | |
| download | gitlab-ce-3f01f05bde8e55b533bc0468ed62485141e827e8.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'lib/api/users.rb')
| -rw-r--r-- | lib/api/users.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb index 11a7368b4c0..0ed468626b7 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -160,6 +160,8 @@ module API end end + user_params.merge!(password_expires_at: Time.now) if user_params[:password].present? + if user.update_attributes(user_params.except(:extern_uid, :provider)) present user, with: Entities::UserPublic else |