| @@ -385,24 +385,6 @@ func RegisterRoutes(m *macaron.Macaron) { | |||||
| m.Post("/keys/delete", userSetting.DeleteKey) | m.Post("/keys/delete", userSetting.DeleteKey) | ||||
| m.Get("/organization", userSetting.Organization) | m.Get("/organization", userSetting.Organization) | ||||
| m.Get("/repos", userSetting.Repos) | m.Get("/repos", userSetting.Repos) | ||||
| // redirects from old settings urls to new ones | |||||
| // TODO: can be removed on next major version | |||||
| m.Get("/avatar", func(ctx *context.Context) { | |||||
| ctx.Redirect(setting.AppSubURL+"/user/settings", http.StatusMovedPermanently) | |||||
| }) | |||||
| m.Get("/email", func(ctx *context.Context) { | |||||
| ctx.Redirect(setting.AppSubURL+"/user/settings/account", http.StatusMovedPermanently) | |||||
| }) | |||||
| m.Get("/delete", func(ctx *context.Context) { | |||||
| ctx.Redirect(setting.AppSubURL+"/user/settings/account", http.StatusMovedPermanently) | |||||
| }) | |||||
| m.Get("/openid", func(ctx *context.Context) { | |||||
| ctx.Redirect(setting.AppSubURL+"/user/settings/security", http.StatusMovedPermanently) | |||||
| }) | |||||
| m.Get("/account_link", func(ctx *context.Context) { | |||||
| ctx.Redirect(setting.AppSubURL+"/user/settings/security", http.StatusMovedPermanently) | |||||
| }) | |||||
| }, reqSignIn, func(ctx *context.Context) { | }, reqSignIn, func(ctx *context.Context) { | ||||
| ctx.Data["PageIsUserSettings"] = true | ctx.Data["PageIsUserSettings"] = true | ||||
| ctx.Data["AllThemes"] = setting.UI.Themes | ctx.Data["AllThemes"] = setting.UI.Themes | ||||