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

1 files changed, 6 insertions, 4 deletions

diff --git a/models/user.go b/models/user.go
index 13c9148473..a46232427e 100644
--- a/models/user.go
+++ b/models/user.go
@@ -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
+				}
 			}
 		}
 	}