Merge remote-tracking branch 'origin/dev' into dev

1 files changed, 4 insertions, 3 deletions

diff --git a/models/user.go b/models/user.go
index 42b3ebe6..e340eed4 100644
--- a/models/user.go
+++ b/models/user.go
@@ -230,9 +230,9 @@ func ChangeUserName(user *User, newUserName string) (err error) {
 		accesses[i].UserName = newUserName
 		if strings.HasPrefix(accesses[i].RepoName, user.LowerName+"/") {
 			accesses[i].RepoName = strings.Replace(accesses[i].RepoName, user.LowerName, newUserName, 1)
-			if err = UpdateAccessWithSession(sess, &accesses[i]); err != nil {
-				return err
-			}
+		}
+		if err = UpdateAccessWithSession(sess, &accesses[i]); err != nil {
+			return err
 		}
 	}
 
@@ -248,6 +248,7 @@ 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