kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/app
History
Dmitriy Zaporozhets 7081ab1e9e 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

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/14c661d1d1f026770997b19af714c514/image.png)

#### Admin edit user page

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0c6f795757e5f03eeb923d818b7d6a96/image.png)

### What are the relevant issue numbers?

This replaces !288.

Closes https://github.com/gitlabhq/gitlabhq/issues/9381

See merge request !922
 		2015-07-02 13:39:35 +00:00
..
assets commit hashes are monospaced 2015-07-01 13:33:29 -03:00
controllers Merge branch 'add-unlock-access' into 'master' 2015-07-02 13:39:35 +00:00
finders Revert merge request states renaming 2015-06-19 17:09:50 +02:00
helpers Merge branch 'group_settings_nav' into 'master' 2015-07-01 09:32:41 +00:00
mailers
…
models 'created_at DESC' is performed twice 2015-07-02 21:28:31 +09:00
services Merge branches inside one repository using rugged instead of satellites 2015-07-01 16:23:58 +02:00
uploaders
…
views Merge branch 'add-unlock-access' into 'master' 2015-07-02 13:39:35 +00:00
workers
…