vendor: update github.com/gogs/go-gogs-client

Bring fixes for gogs#5538
yakey2008 · Dec 3, 2018 · 9811494 · 9811494
1 parent 6690023
commit 9811494
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 24 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -39,7 +39,7 @@ If applicable, add screenshots to help explain your problem.
 - Gogs version (or commit ref): 
 - Git version: 
 - Operating system: 
-- Database (use `[x]`):
+- Database (replace `[ ]` with `[x]`):
   - [ ] PostgreSQL
   - [ ] MySQL
   - [ ] MSSQL

diff --git a/models/user.go b/models/user.go
@@ -132,6 +132,7 @@ func (u *User) APIFormat() *api.User {
 	return &api.User{
 		ID:        u.ID,
 		UserName:  u.Name,
+		Login:     u.Name,
 		FullName:  u.FullName,
 		Email:     u.Email,
 		AvatarUrl: u.AvatarLink(),

diff --git a/routes/api/v1/repo/collaborators.go b/routes/api/v1/repo/collaborators.go
@@ -15,19 +15,15 @@ import (
 func ListCollaborators(c *context.APIContext) {
 	collaborators, err := c.Repo.Repository.GetCollaborators()
 	if err != nil {
-		if errors.IsUserNotExist(err) {
-			c.Error(422, "", err)
-		} else {
-			c.Error(500, "GetCollaborators", err)
-		}
+		c.ServerError("GetCollaborators", err)
 		return
 	}
 
 	apiCollaborators := make([]*api.Collaborator, len(collaborators))
 	for i := range collaborators {
 		apiCollaborators[i] = collaborators[i].APIFormat()
 	}
-	c.JSON(200, &apiCollaborators)
+	c.JSONSuccess(&apiCollaborators)
 }
 
 func AddCollaborator(c *context.APIContext, form api.AddCollaboratorOption) {

diff --git a/vendor/github.com/gogs/go-gogs-client/gogs.go b/vendor/github.com/gogs/go-gogs-client/gogs.go
diff --git a/vendor/github.com/gogs/go-gogs-client/user.go b/vendor/github.com/gogs/go-gogs-client/user.go
diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -219,10 +219,10 @@
 			"revisionTime": "2018-10-23T10:58:32Z"
 		},
 		{
-			"checksumSHA1": "zQkw7E0MzSfPem4f9eCGhue21Nw=",
+			"checksumSHA1": "zjkjsFMM7ML0rZBOLxMU2yxHxx4=",
 			"path": "github.com/gogs/go-gogs-client",
-			"revision": "0c040274bc4e176c86a466e2ae327324fc143269",
-			"revisionTime": "2018-12-02T17:53:48Z"
+			"revision": "2040be8569f298967623526418f718a86e725f9b",
+			"revisionTime": "2018-12-03T19:42:48Z"
 		},
 		{
 			"checksumSHA1": "GaJLoEuMGnP5ofXvuweAI4wx06U=",