Merge password and 2fa page on user settings (#2695)

* merge password and 2fa page on user settings
This commit is contained in:
Lunny Xiao 2017-10-16 17:14:12 +08:00 committed by Kim "BKC" Carlbäcker
parent c1b0c9e7c4
commit 9e865cee67
7 changed files with 117 additions and 89 deletions

View file

@ -71,11 +71,11 @@ func testLinksAsUser(userName string, t *testing.T) {
"/user2?tab=activity",
"/user/settings",
"/user/settings/avatar",
"/user/settings/password",
"/user/settings/security",
"/user/settings/security/two_factor/enroll",
"/user/settings/email",
"/user/settings/keys",
"/user/settings/applications",
"/user/settings/two_factor",
"/user/settings/account_link",
"/user/settings/organization",
"/user/settings/delete",