Merge branch 'develop' of github.com:gogits/gogs into feature/milestone

# Conflicts:
#	gogs.go
#	models/issue.go
#	templates/.VERSION
This commit is contained in:
Unknwon 2015-08-05 20:26:00 +08:00
commit 2c507667bf
25 changed files with 242 additions and 157 deletions

View file

@ -624,7 +624,7 @@ func GetRepositoriesWithUsers(num, offset int) ([]*Repository, error) {
if err != nil {
return nil, err
} else if !has {
return nil, ErrUserNotExist
return nil, ErrUserNotExist{repo.OwnerId, ""}
}
}