diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-03 11:00:51 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-03 11:00:51 +0000 |
| commit | 4291e28af72890ee4f9c0f306ba691ba84c3435d (patch) | |
| tree | 980036c1fb0affa984da0c8135d0ffca115baa7c /CHANGELOG | |
| parent | 0df317f7297b9a72e888edc09aed51f83414f92a (diff) | |
| parent | d386bb780864f4fc36490e19ea654f31bf193d0f (diff) | |
| download | gitlab-ce-4291e28af72890ee4f9c0f306ba691ba84c3435d.tar.gz | |
Merge branch 'change-primary-email' into 'master'
Allow primary email to be set to an email that you've already added.
Fixes gitlab-com/support-forum#106.
When the user sets their primary email to an email that they've already added to their account, this patch makes sure that secondary email record is destroyed, and a new email record is created for the old primary email. This is based on the assumption that in this case no email was meant to be deleted, but the user simply wanted to change which of their emails is primary.
See merge request !591
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 104d3869f93..52783cbdd92 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,7 @@ v 7.11.0 (unreleased) - Add application setting to restrict user signups to e-mail domains (Stan Hu) - Don't allow a merge request to be merged when its title starts with "WIP". - Add a page title to every page. + - Allow primary email to be set to an email that you've already added. - Get Gitorious importer to work again. - Fix clone URL field and X11 Primary selection (Dmitry Medvinsky) - Ignore invalid lines in .gitmodules |