diff options
| author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-02-03 17:25:26 +0000 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-02-03 17:25:26 +0000 |
| commit | 1af3f3b673be8f85b37d455b101954e62c2a3add (patch) | |
| tree | 56f09bef2ca41964fae3efaf4f15be7fe1640ba4 /lib/api/users.rb | |
| parent | 67c8526033241f6bd190fa16622970b3919e6dbd (diff) | |
| parent | bd8f2b15b3d5267075a626ce86f3a06cc650fcbf (diff) | |
| download | gitlab-ce-1af3f3b673be8f85b37d455b101954e62c2a3add.tar.gz | |
Merge branch 'master' into jej-pages-picked-from-ee
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 |