summaryrefslogtreecommitdiffstats
path: root/models
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2016-01-28 06:07:16 -0500
committerUnknwon <u@gogs.io>2016-01-28 06:07:16 -0500
commit4deb87634370c33e4890db47bd64196cff0a05b9 (patch)
treedbb569668a5b156fb567d9de9e11ddef49d45cdb /models
parent0617720c0cd432d3160fed3f514b81d2967cf9aa (diff)
downloadgitea-4deb87634370c33e4890db47bd64196cff0a05b9.tar.gz
gitea-4deb87634370c33e4890db47bd64196cff0a05b9.zip
Minor fix for #2494
- Change tooltip size from mini to tiny in profile page
Diffstat (limited to 'models')
-rw-r--r--models/pull.go6
-rw-r--r--models/user.go6
2 files changed, 6 insertions, 6 deletions
diff --git a/models/pull.go b/models/pull.go
index 2fe7d1fe37..47d80473a0 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -525,11 +525,11 @@ func AddTestPullRequestTask(repoID int64, branch string) {
}
}
-func ChangeUsernameInPullRequests(oldUserName, newUserName string) (error) {
+func ChangeUsernameInPullRequests(oldUserName, newUserName string) error {
pr := PullRequest{
- HeadUserName : newUserName,
+ HeadUserName: strings.ToLower(newUserName),
}
- _, err := x.Cols("head_user_name").Where("head_user_name = ?", oldUserName).Update(pr)
+ _, err := x.Cols("head_user_name").Where("head_user_name = ?", strings.ToLower(oldUserName)).Update(pr)
return err
}
diff --git a/models/user.go b/models/user.go
index 5d8075dbd1..31ac1e22dc 100644
--- a/models/user.go
+++ b/models/user.go
@@ -599,12 +599,12 @@ func ChangeUserName(u *User, newUserName string) (err error) {
return ErrUserAlreadyExist{newUserName}
}
- err = ChangeUsernameInPullRequests(u.LowerName, newUserName)
+ err = ChangeUsernameInPullRequests(u.Name, newUserName)
if err != nil {
- return err
+ return fmt.Errorf("ChangeUsernameInPullRequests: %v", err)
}
- return os.Rename(UserPath(u.LowerName), UserPath(newUserName))
+ return os.Rename(UserPath(u.Name), UserPath(newUserName))
}
func updateUser(e Engine, u *User) error {