summaryrefslogtreecommitdiffstats
path: root/models/user.go
diff options
context:
space:
mode:
authorPeter Smit <peter@smitmail.eu>2015-02-12 14:25:07 +0200
committerPeter Smit <peter@smitmail.eu>2015-02-12 14:25:07 +0200
commit6c1ee384f1a45ed97f39b085209bcb79cafd9145 (patch)
tree0798c98ff2fa93324edae6cfcb539cf51fc4b7fd /models/user.go
parent0a4cda0dd4d7c906668d9d2e283fbe9ebe2e1608 (diff)
parent0d158e569b0c19614b5e946849e8b7a8e4a75015 (diff)
downloadgitea-6c1ee384f1a45ed97f39b085209bcb79cafd9145.tar.gz
gitea-6c1ee384f1a45ed97f39b085209bcb79cafd9145.zip
Merge remote-tracking branch 'mine/access_refactor' into access_refactor
Conflicts: cmd/serve.go models/access.go models/migrations/migrations.go models/org.go models/repo.go models/user.go modules/middleware/org.go modules/middleware/repo.go routers/api/v1/repo.go routers/org/teams.go routers/repo/http.go routers/user/home.go
Diffstat (limited to 'models/user.go')
-rw-r--r--models/user.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/models/user.go b/models/user.go
index 9a6f93a474..7e3dc260e5 100644
--- a/models/user.go
+++ b/models/user.go
@@ -395,6 +395,7 @@ func ChangeUserName(u *User, newUserName string) (err error) {
if !IsLegalName(newUserName) {
return ErrUserNameIllegal
}
+
return os.Rename(UserPath(u.LowerName), UserPath(newUserName))
}