Merge branch 'master' of github.com:gogits/gogs

Conflicts:
	public/js/app.js

1 files changed, 8 insertions, 1 deletions

diff --git a/models/user.go b/models/user.go
index 76cf2d20..fd89af6b 100644
--- a/models/user.go
+++ b/models/user.go
@@ -51,6 +51,7 @@ type User struct {
 	Location      string
 	Website       string
 	IsActive      bool
+	IsAdmin       bool
 	Rands         string    `xorm:"VARCHAR(10)"`
 	Created       time.Time `xorm:"created"`
 	Updated       time.Time `xorm:"updated"`
@@ -136,7 +137,13 @@ func RegisterUser(user *User) (*User, error) {
 		}
 		return nil, err
 	}
-	return user, nil
+
+	if user.Id == 1 {
+		user.IsAdmin = true
+		user.IsActive = true
+		_, err = orm.Id(user.Id).UseBool().Update(user)
+	}
+	return user, err
 }
 
 // get user by erify code