diff options
author | Robert Speicher <robert@gitlab.com> | 2015-12-21 17:53:20 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2015-12-21 17:53:20 +0000 |
commit | 9570495e75f90d1011531753dd41f0c06e8fcf99 (patch) | |
tree | d3326bfcba348788103a5298ab9d4475bc22b773 /CHANGELOG | |
parent | 17ed42e362032e3594ae1cf34e6a970be826bdca (diff) | |
parent | be41d84fb078667694ecbf5f2729175fbf8b0343 (diff) | |
download | gitlab-ce-9570495e75f90d1011531753dd41f0c06e8fcf99.tar.gz |
Merge branch 'add_email_unlock' into 'master'
Allow account unlock via email
We see a lot of users get confused about what it means when your account gets
locked. Many try to reset their password and are still faced with a lockout.
With this change, users receive an email that allows them to unlock their
account immediately. The previous behavior where the account is auto-unlocked
after a time also still works.
See merge request !2049
Diffstat (limited to 'CHANGELOG')
-rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 121cf1b1933..828c0a5e7fc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -24,6 +24,7 @@ v 8.3.0 (unreleased) - Backport JIRA features from EE to CE - Add ignore whitespace change option to commit view - Fire update hook from GitLab + - Allow account unlock via email - Style warning about mentioning many people in a comment - Fix: sort milestones by due date once again (Greg Smethells) - Migrate all CI::Services and CI::WebHooks to Services and WebHooks |