mirror of https://github.com/go-gitea/gitea.git
fix 500: E-mail already used in user settings page
parent
81a44e4cd0
commit
63c1f9a23f
|
@ -74,11 +74,11 @@ func checkVersion() {
|
||||||
|
|
||||||
// Check dependency version.
|
// Check dependency version.
|
||||||
checkers := []VerChecker{
|
checkers := []VerChecker{
|
||||||
{"github.com/Unknwon/macaron", macaron.Version, "0.4.7"},
|
{"github.com/Unknwon/macaron", macaron.Version, "0.4.9"},
|
||||||
{"github.com/macaron-contrib/binding", binding.Version, "0.0.4"},
|
{"github.com/macaron-contrib/binding", binding.Version, "0.0.4"},
|
||||||
{"github.com/macaron-contrib/csrf", csrf.Version, "0.0.1"},
|
{"github.com/macaron-contrib/csrf", csrf.Version, "0.0.1"},
|
||||||
{"github.com/macaron-contrib/i18n", i18n.Version, "0.0.4"},
|
{"github.com/macaron-contrib/i18n", i18n.Version, "0.0.5"},
|
||||||
{"github.com/macaron-contrib/session", session.Version, "0.1.0"},
|
{"github.com/macaron-contrib/session", session.Version, "0.1.1"},
|
||||||
}
|
}
|
||||||
for _, c := range checkers {
|
for _, c := range checkers {
|
||||||
ver := strings.Join(strings.Split(c.Version(), ".")[:3], ".")
|
ver := strings.Join(strings.Split(c.Version(), ".")[:3], ".")
|
||||||
|
|
2
gogs.go
2
gogs.go
|
@ -17,7 +17,7 @@ import (
|
||||||
"github.com/gogits/gogs/modules/setting"
|
"github.com/gogits/gogs/modules/setting"
|
||||||
)
|
)
|
||||||
|
|
||||||
const APP_VER = "0.5.10.1222 Beta"
|
const APP_VER = "0.5.10.1229 Beta"
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||||
|
|
|
@ -453,7 +453,7 @@ func ChangeUserName(u *User, newUserName string) (err error) {
|
||||||
|
|
||||||
// UpdateUser updates user's information.
|
// UpdateUser updates user's information.
|
||||||
func UpdateUser(u *User) error {
|
func UpdateUser(u *User) error {
|
||||||
has, err := x.Where("id!=?", u.Id).And("email=?", u.Email).Get(new(User))
|
has, err := x.Where("id!=?", u.Id).And("type=?", INDIVIDUAL).And("email=?", u.Email).Get(new(User))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
} else if has {
|
} else if has {
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
0.5.10.1222 Beta
|
0.5.10.1229 Beta
|
Loading…
Reference in New Issue