Merge pull request #992 from Bugagazavr/gitlab-zero-expiry

Since 7.10 token life unlimited
This commit is contained in:
Brad Rydzewski 2015-04-24 16:36:02 -07:00
commit c475195537

View file

@ -268,7 +268,7 @@ func (r *Gitlab) OpenRegistration() bool {
func (r *Gitlab) GetToken(user *model.User) (*model.Token, error) { func (r *Gitlab) GetToken(user *model.User) (*model.Token, error) {
expiry := time.Unix(user.TokenExpiry, 0) expiry := time.Unix(user.TokenExpiry, 0)
if expiry.Sub(time.Now()) > (60 * time.Second) { if user.TokenExpiry == 0 || expiry.Sub(time.Now()) > (60*time.Second) {
return nil, nil return nil, nil
} }