summaryrefslogtreecommitdiff
path: root/lib/api/helpers.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-03 11:00:51 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-03 11:00:51 +0000
commit4291e28af72890ee4f9c0f306ba691ba84c3435d (patch)
tree980036c1fb0affa984da0c8135d0ffca115baa7c /lib/api/helpers.rb
parent0df317f7297b9a72e888edc09aed51f83414f92a (diff)
parentd386bb780864f4fc36490e19ea654f31bf193d0f (diff)
downloadgitlab-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 'lib/api/helpers.rb')
0 files changed, 0 insertions, 0 deletions