aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--integrations/user_test.go26
-rw-r--r--models/user/user.go10
2 files changed, 26 insertions, 10 deletions
diff --git a/integrations/user_test.go b/integrations/user_test.go
index 24f2a4d6a8..f7c9acb057 100644
--- a/integrations/user_test.go
+++ b/integrations/user_test.go
@@ -75,23 +75,41 @@ func TestRenameReservedUsername(t *testing.T) {
defer prepareTestEnv(t)()
reservedUsernames := []string{
+ ".",
+ "..",
+ ".well-known",
"admin",
"api",
+ "assets",
"attachments",
+ "avatar",
"avatars",
+ "captcha",
+ "commits",
+ "debug",
+ "error",
"explore",
- "help",
- "install",
+ "favicon.ico",
+ "ghost",
"issues",
"login",
+ "manifest.json",
"metrics",
+ "milestones",
+ "new",
"notifications",
"org",
"pulls",
+ "raw",
"repo",
- "template",
- "user",
+ "repo-avatars",
+ "robots.txt",
"search",
+ "serviceworker.js",
+ "ssh_info",
+ "swagger.v1.json",
+ "user",
+ "v2",
}
session := loginUser(t, "user2")
diff --git a/models/user/user.go b/models/user/user.go
index 884e84e7e7..c848895239 100644
--- a/models/user/user.go
+++ b/models/user/user.go
@@ -576,6 +576,7 @@ var (
"api",
"assets",
"attachments",
+ "avatar",
"avatars",
"captcha",
"commits",
@@ -584,10 +585,7 @@ var (
"explore",
"favicon.ico",
"ghost",
- "help",
- "install",
"issues",
- "less",
"login",
"manifest.json",
"metrics",
@@ -595,15 +593,15 @@ var (
"new",
"notifications",
"org",
- "plugins",
"pulls",
"raw",
"repo",
+ "repo-avatars",
"robots.txt",
"search",
"serviceworker.js",
- "stars",
- "template",
+ "ssh_info",
+ "swagger.v1.json",
"user",
"v2",
}