diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-02 16:39:35 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-02 16:39:35 +0300 |
| commit | 7081ab1e9e5db61546df3e937c815f4e701b7ea0 (patch) | |
| tree | 4e08b98864d3a49cd4cbafbb6d90bffb8b1225da /CHANGELOG | |
| parent | d2f903c2d077fec1efbbe014b09fd576ccb268ec (diff) | |
| parent | 3e738e3b9aeae5620116109258c4d4da84180e7e (diff) | |
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 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 1c16ff728a5..ec28ffac92f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.13.0 (unreleased) - Fix external issue tracker hook/test for HTTPS URLs (Daniel Gerhardt) - Remove link leading to a 404 error in Deploy Keys page (Stan Hu) + - Add support for unlocking users in admin settings (Stan Hu) - Fix order of issues imported form GitHub (Hiroyuki Sato) - Bump rugments to 1.0.0beta8 to fix C prototype function highlighting (Jonathon Reinhart) - Fix Merge Request webhook to properly fire "merge" action when accepted from the web UI |