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

# Conflicts:
#	gogs.go
#	models/issue.go
#	templates/.VERSION

1 files changed, 14 insertions, 0 deletions

diff --git a/models/error.go b/models/error.go
index 01adeb425b..38a3c0534e 100644
--- a/models/error.go
+++ b/models/error.go
@@ -54,6 +54,20 @@ func (err ErrUserAlreadyExist) Error() string {
 	return fmt.Sprintf("user already exists: [name: %s]", err.Name)
 }
 
+type ErrUserNotExist struct {
+	UID  int64
+	Name string
+}
+
+func IsErrUserNotExist(err error) bool {
+	_, ok := err.(ErrUserNotExist)
+	return ok
+}
+
+func (err ErrUserNotExist) Error() string {
+	return fmt.Sprintf("user does not exist: [uid: %d, name: %s]", err.UID, err.Name)
+}
+
 type ErrEmailAlreadyUsed struct {
 	Email string
 }