From 51aafbde9282aea7fe53cc0a14294466c74bf66b Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@kbt.io>
Date: Mon, 23 Sep 2019 08:13:15 +0200
Subject: [PATCH 1/4] Test more reserved usernames

---
 integrations/user_test.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/integrations/user_test.go b/integrations/user_test.go
index 6d67927d16768..9efa3d0b2dd5c 100644
--- a/integrations/user_test.go
+++ b/integrations/user_test.go
@@ -77,6 +77,10 @@ func TestRenameReservedUsername(t *testing.T) {
 		"help",
 		"user",
 		"template",
+		"explore",
+		"api",
+		"org",
+		"avatar",
 	}
 
 	session := loginUser(t, "user2")

From 1d9e2942fb429e9e8d87fc967a266a5dde6b879e Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@kbt.io>
Date: Mon, 23 Sep 2019 08:20:42 +0200
Subject: [PATCH 2/4] Add more reserved usernames, sort them

---
 integrations/user_test.go | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/integrations/user_test.go b/integrations/user_test.go
index 9efa3d0b2dd5c..4d73bceb786b3 100644
--- a/integrations/user_test.go
+++ b/integrations/user_test.go
@@ -74,13 +74,22 @@ func TestRenameReservedUsername(t *testing.T) {
 	prepareTestEnv(t)
 
 	reservedUsernames := []string{
-		"help",
-		"user",
-		"template",
-		"explore",
+		"admin",
 		"api",
-		"org",
+		"attachments",
 		"avatar",
+		"explore",
+		"help",
+		"install",
+		"issues",
+		"login",
+		"metrics",
+		"notifications",
+		"org",
+		"pulls",
+		"repo",
+		"template",
+		"user",
 	}
 
 	session := loginUser(t, "user2")

From 7deab72e94489198b6cdf09231e43a722e2c7c4e Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@kbt.io>
Date: Mon, 23 Sep 2019 09:36:27 +0200
Subject: [PATCH 3/4] Reserve "attachments" username (is a used route)

---
 models/user.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/models/user.go b/models/user.go
index af4ccacf6fbc3..53a087b3c5167 100644
--- a/models/user.go
+++ b/models/user.go
@@ -775,6 +775,7 @@ func NewGhostUser() *User {
 
 var (
 	reservedUsernames = []string{
+		"attachments",
 		"admin",
 		"api",
 		"assets",

From 4c0fc1ddf94dbd9b9820eb8a15a33bbcb549566e Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@kbt.io>
Date: Tue, 24 Sep 2019 12:04:53 +0200
Subject: [PATCH 4/4] It's "avatars" being reserved, not "avatar"

---
 integrations/user_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/integrations/user_test.go b/integrations/user_test.go
index 4d73bceb786b3..0a6fdd19d5a09 100644
--- a/integrations/user_test.go
+++ b/integrations/user_test.go
@@ -77,7 +77,7 @@ func TestRenameReservedUsername(t *testing.T) {
 		"admin",
 		"api",
 		"attachments",
-		"avatar",
+		"avatars",
 		"explore",
 		"help",
 		"install",