diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-05 12:43:03 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-05 12:43:03 +0300 |
| commit | c8d00787c265a6920ea082c621ffc9c1f6ea960c (patch) | |
| tree | 37517f4bf32943edf420b02ba73ef2d62c94fc88 /CHANGELOG | |
| parent | 46a84d801374f212055440c435a0a0199ed66968 (diff) | |
| parent | 0c1ccda43fe04300a07a5f046a7c1cbae56cff32 (diff) | |
Merge branch 'add-resend-confirm-email-admin-page' into 'master'
Add "Confirm user" button to admin page
### What does this MR do?
This MR adds a "Confirm user" to the admin user page.
### Why was this MR needed?
There is no way for an admin to force a user confirmation. Some users create users in the API and then don't have a way to force the user into a confirmed state.
Originally, I attempted to add a link to allow the admin to resend a confirmation e-mail. But that may not be helpful because a user can be in the unconfirmed state with no `unconfirmed_email` set.
### Screenshot
### What are the relevant issue numbers?
* Closes #2116
* Closes https://github.com/gitlabhq/gitlabhq/issues/9502
See merge request !1067
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 5d78e2556c3..258759193ad 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.14.0 (unreleased) - Fix multi-line syntax highlighting (Stan Hu) - Fix network graph when branch name has single quotes (Stan Hu) + - Add "Confirm user" button in user admin page (Stan Hu) - Upgrade gitlab_git to version 7.2.6 to fix Error 500 when creating network graphs (Stan Hu) - Add support for Unicode filenames in relative links (Hiroyuki Sato) - Fix URL used for refreshing notes if relative_url is present (Bartłomiej Święcki) |