diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2017-10-16 17:14:12 +0800 |
|---|---|---|
| committer | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2017-10-16 11:14:12 +0200 |
| commit | 9e865cee67728486959a4fcbbf2112a57df7e331 (patch) | |
| tree | 990ce63731e753ed1f71c4e1bffbb541a02195f7 /routers/routes | |
| parent | c1b0c9e7c4bbb669ea03694c30c9ff66a109ef17 (diff) | |
| download | gitea-9e865cee67728486959a4fcbbf2112a57df7e331.tar.gz gitea-9e865cee67728486959a4fcbbf2112a57df7e331.zip | |
Merge password and 2fa page on user settings (#2695)
* merge password and 2fa page on user settings
Diffstat (limited to 'routers/routes')
| -rw-r--r-- | routers/routes/routes.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/routers/routes/routes.go b/routers/routes/routes.go index a6f73aaedd..749f8263f8 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -220,8 +220,8 @@ func RegisterRoutes(m *macaron.Macaron) { m.Combo("/email").Get(user.SettingsEmails). Post(bindIgnErr(auth.AddEmailForm{}), user.SettingsEmailPost) m.Post("/email/delete", user.DeleteEmail) - m.Get("/password", user.SettingsPassword) - m.Post("/password", bindIgnErr(auth.ChangePasswordForm{}), user.SettingsPasswordPost) + m.Get("/security", user.SettingsSecurity) + m.Post("/security", bindIgnErr(auth.ChangePasswordForm{}), user.SettingsSecurityPost) m.Group("/openid", func() { m.Combo("").Get(user.SettingsOpenID). Post(bindIgnErr(auth.AddOpenIDForm{}), user.SettingsOpenIDPost) @@ -238,8 +238,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Combo("/account_link").Get(user.SettingsAccountLinks).Post(user.SettingsDeleteAccountLink) m.Get("/organization", user.SettingsOrganization) m.Get("/repos", user.SettingsRepos) - m.Group("/two_factor", func() { - m.Get("", user.SettingsTwoFactor) + m.Group("/security/two_factor", func() { m.Post("/regenerate_scratch", user.SettingsTwoFactorRegenerateScratch) m.Post("/disable", user.SettingsTwoFactorDisable) m.Get("/enroll", user.SettingsTwoFactorEnroll) |