diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2014-05-05 16:42:15 +0800 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2014-05-05 16:42:15 +0800 |
| commit | d8136c9c3cf0f7d84510402f01cbe07a656a0587 (patch) | |
| tree | 2a1a7553a111a008a0322625c30130ca952b6acd /models/user.go | |
| parent | 02687cbdf37be3c89005abe45c7d1f6240e339e0 (diff) | |
| parent | 1652dd5068f2f3ae1851bc2321832c88af85d570 (diff) | |
| download | gitea-d8136c9c3cf0f7d84510402f01cbe07a656a0587.tar.gz gitea-d8136c9c3cf0f7d84510402f01cbe07a656a0587.zip | |
Merge branch 'dev-ldap' into dev
Diffstat (limited to 'models/user.go')
| -rw-r--r-- | models/user.go | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/models/user.go b/models/user.go index 27140cf1c1..a4b753f8e1 100644 --- a/models/user.go +++ b/models/user.go @@ -26,12 +26,6 @@ const ( UT_ORGANIZATION ) -// Login types. -const ( - LT_PLAIN = iota + 1 - LT_LDAP -) - var ( ErrUserOwnRepos = errors.New("User still have ownership of repositories") ErrUserAlreadyExist = errors.New("User already exist") @@ -50,6 +44,7 @@ type User struct { Email string `xorm:"unique not null"` Passwd string `xorm:"not null"` LoginType int + LoginSource int64 `xorm:"not null default 0"` Type int NumFollowers int NumFollowings int |