Merge branch 'dev' of github.com:gogits/gogs into dev

This commit is contained in:
Unknown 2014-07-12 00:55:35 -04:00
commit 3969d704a0
6 changed files with 256 additions and 36 deletions

View file

@ -297,10 +297,12 @@ func ChangeUserName(user *User, newUserName string) (err error) {
}
for j := range accesses {
accesses[j].UserName = newUserName
accesses[j].RepoName = newUserName + "/" + repos[i].LowerName
if err = UpdateAccessWithSession(sess, &accesses[j]); err != nil {
return err
// if the access is not the user's access (already updated above)
if accesses[j].UserName != user.LowerName {
accesses[j].RepoName = newUserName + "/" + repos[i].LowerName
if err = UpdateAccessWithSession(sess, &accesses[j]); err != nil {
return err
}
}
}
}