diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-05 09:43:03 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-05 09:43:03 +0000 |
| commit | c8d00787c265a6920ea082c621ffc9c1f6ea960c (patch) | |
| tree | 37517f4bf32943edf420b02ba73ef2d62c94fc88 /lib/api/files.rb | |
| parent | 46a84d801374f212055440c435a0a0199ed66968 (diff) | |
| parent | 0c1ccda43fe04300a07a5f046a7c1cbae56cff32 (diff) | |
| download | gitlab-ce-c8d00787c265a6920ea082c621ffc9c1f6ea960c.tar.gz | |
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 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions