Updated Auth Page

cmd/web.go

@@ -174,7 +174,7 @@ func runWeb(c *cli.Context) error {
 	m.Get("/^:type(issues|pulls)$", reqSignIn, user.Issues)
 
 	// ***** START: User *****
-	m.Group("/user", func() {
+	m.Group("", func() {
 		m.Group("/login", func() {
 			m.Combo("").Get(user.Login).
 				Post(bindIgnErr(form.SignIn{}), user.LoginPost)
@@ -182,8 +182,8 @@ func runWeb(c *cli.Context) error {
 			m.Combo("/two_factor_recovery_code").Get(user.LoginTwoFactorRecoveryCode).Post(user.LoginTwoFactorRecoveryCodePost)
 		})
 
-		m.Get("/sign_up", user.SignUp)
-		m.Post("/sign_up", bindIgnErr(form.Register{}), user.SignUpPost)
+		m.Get("/join", user.SignUp)
+		m.Post("/join", bindIgnErr(form.Register{}), user.SignUpPost)
 		m.Get("/reset_password", user.ResetPasswd)
 		m.Post("/reset_password", user.ResetPasswdPost)
 	}, reqSignOut)

models/user.go

@@ -533,7 +533,7 @@ func NewGhostUser() *User {
 }
 
 var (
-	reservedUsernames    = []string{"explore", "create", "assets", "css", "img", "js", "less", "plugins", "debug", "raw", "install", "api", "avatar", "user", "org", "help", "stars", "issues", "pulls", "commits", "repo", "template", "admin", "new", "pages", "about", "privacy", "faq", "tos", "status", "developers", "brand", "contact", "heartbeat", "verified", "contribute", "status", "blog", "maker", "brand", "jobs", "features", "makers", "features", "request", ".", ".."}
+	reservedUsernames    = []string{"login", "join", "explore", "create", "assets", "css", "img", "js", "less", "plugins", "debug", "raw", "install", "api", "avatar", "user", "org", "help", "stars", "issues", "pulls", "commits", "repo", "template", "admin", "new", "pages", "about", "privacy", "faq", "tos", "status", "developers", "brand", "contact", "heartbeat", "verified", "contribute", "status", "blog", "maker", "brand", "jobs", "features", "makers", "features", "request", ".", ".."}
 	reservedUserPatterns = []string{"*.keys"}
 )
 

public/robots.txt

@@ -8,6 +8,7 @@ Disallow: /admin
 Disallow: /*/*/forks
 Disallow: /*/*/stars
 Disallow: /*/*/pulls
+Disallow: /*/*/watchers
 Disallow: /*/*/archive
 Disallow: /*/*/settings
 Disallow: /*/*/raw/*