Merge lp:~deryck/launchpad/email-update-login-stuck-1036267 into lp:launchpad
Proposed by
Deryck Hodge
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Deryck Hodge | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 15799 | ||||
Proposed branch: | lp:~deryck/launchpad/email-update-login-stuck-1036267 | ||||
Merge into: | lp:launchpad | ||||
Diff against target: |
87 lines (+34/-4) 2 files modified
lib/lp/services/webapp/login.py (+14/-3) lib/lp/services/webapp/tests/test_login.py (+20/-1) |
||||
To merge this branch: | bzr merge lp:~deryck/launchpad/email-update-login-stuck-1036267 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Deryck Hodge (community) | Approve | ||
Review via email: mp+119381@code.launchpad.net |
Commit message
The code for requiring re-authentication when editing emails was only partially merged. This completes the merge to have fully working re-auth when editing emails.
Description of the change
This change has already landed once, been reverted, and partially landed again. This branch is to complete the merge of the work I did to force re-authentication when editing email addresses. I'm self reviewing since it's all been reviewed twice now, but the merge was messed up somehow.
To post a comment you must log in.