fix 500: E-mail already used in user settings page

cmd/web.go

@@ -74,11 +74,11 @@ func checkVersion() {
 
 	// Check dependency version.
 	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/csrf", csrf.Version, "0.0.1"},
-		{"github.com/macaron-contrib/i18n", i18n.Version, "0.0.4"},
-		{"github.com/macaron-contrib/session", session.Version, "0.1.0"},
+		{"github.com/macaron-contrib/i18n", i18n.Version, "0.0.5"},
+		{"github.com/macaron-contrib/session", session.Version, "0.1.1"},
 	}
 	for _, c := range checkers {
 		ver := strings.Join(strings.Split(c.Version(), ".")[:3], ".")

gogs.go

@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.5.10.1222 Beta"
+const APP_VER = "0.5.10.1229 Beta"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())

models/user.go

@@ -453,7 +453,7 @@ func ChangeUserName(u *User, newUserName string) (err error) {
 
 // UpdateUser updates user's information.
 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 {
 		return err
 	} else if has {

templates/.VERSION

@@ -1 +1 @@
-0.5.10.1222 Beta
+0.5.10.1229 Beta