diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-16 16:15:40 -0500 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-16 16:15:40 -0500 |
| commit | eb42f95c184536da6fe6ac5286d54f7282dbfbab (patch) | |
| tree | a1a04f0ed23bfd8a77747ced020ed03d92b955c8 /app/controllers/admin/users_controller.rb | |
| parent | a26ec8a10660ca6ffcf49abac6ddad57fd99f80d (diff) | |
| parent | 8b15628dd0de2474ad662b8d78a7c9a466e2a296 (diff) | |
| download | gitlab-ce-eb42f95c184536da6fe6ac5286d54f7282dbfbab.tar.gz | |
Merge remote-tracking branch 'origin/master' into docker-registry-view
Diffstat (limited to 'app/controllers/admin/users_controller.rb')
| -rw-r--r-- | app/controllers/admin/users_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index f2f654c7bcd..6908a3bf946 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -119,6 +119,7 @@ class Admin::UsersController < Admin::ApplicationController user_params_with_pass.merge!( password: params[:user][:password], password_confirmation: params[:user][:password_confirmation], + password_expires_at: Time.now ) end |