diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-02 13:39:35 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-02 13:39:35 +0000 |
| commit | 7081ab1e9e5db61546df3e937c815f4e701b7ea0 (patch) | |
| tree | 4e08b98864d3a49cd4cbafbb6d90bffb8b1225da /app/controllers | |
| parent | d2f903c2d077fec1efbbe014b09fd576ccb268ec (diff) | |
| parent | 3e738e3b9aeae5620116109258c4d4da84180e7e (diff) | |
| download | gitlab-ce-7081ab1e9e5db61546df3e937c815f4e701b7ea0.tar.gz | |
Merge branch 'add-unlock-access' into 'master'
Add support for unlocking users in admin settings
### What does this MR do?
This MR gives the ability to unlock a user from the Admin panel.
### Why was this MR needed?
If a user fails to login a certain number of times, Devise locks the user out for a certain amount of time (e.g. 10 minutes). There is no way for an admin to unlock a user if this happens (aside from editing the `locked_at` field entirely).
### Screenshots
#### Admin index page
#### Admin edit user page
### What are the relevant issue numbers?
This replaces !288.
Closes https://github.com/gitlabhq/gitlabhq/issues/9381
See merge request !922
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/users_controller.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index ec29c320654..7a683098df3 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -47,6 +47,14 @@ class Admin::UsersController < Admin::ApplicationController end end + def unlock + if user.unlock_access! + redirect_to :back, alert: "Successfully unlocked" + else + redirect_to :back, alert: "Error occurred. User was not unlocked" + end + end + def create opts = { force_random_password: true, |