aboutsummaryrefslogtreecommitdiff
path: root/vendor/github.com
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2018-12-03 14:45:19 -0500
committerUnknwon <u@gogs.io>2018-12-03 14:45:19 -0500
commit98114944fc325ece658c40bf4eba125238c47bd5 (patch)
tree5dc10c5a7e43f7a5a79c43a773f3627a0feb11af /vendor/github.com
parent6690023555e033ea25adb1f5bbcfac85d3ac9a25 (diff)
vendor: update github.com/gogs/go-gogs-client
Bring fixes for #5538
Diffstat (limited to 'vendor/github.com')
-rw-r--r--vendor/github.com/gogs/go-gogs-client/gogs.go2
-rw-r--r--vendor/github.com/gogs/go-gogs-client/user.go15
2 files changed, 3 insertions, 14 deletions
diff --git a/vendor/github.com/gogs/go-gogs-client/gogs.go b/vendor/github.com/gogs/go-gogs-client/gogs.go
index 582900f8..8d1e837f 100644
--- a/vendor/github.com/gogs/go-gogs-client/gogs.go
+++ b/vendor/github.com/gogs/go-gogs-client/gogs.go
@@ -14,7 +14,7 @@ import (
)
func Version() string {
- return "0.12.13"
+ return "0.12.14"
}
// Client represents a Gogs API client.
diff --git a/vendor/github.com/gogs/go-gogs-client/user.go b/vendor/github.com/gogs/go-gogs-client/user.go
index 3879b1a6..bbe0ca9f 100644
--- a/vendor/github.com/gogs/go-gogs-client/user.go
+++ b/vendor/github.com/gogs/go-gogs-client/user.go
@@ -5,30 +5,19 @@
package gogs
import (
- "encoding/json"
"fmt"
)
// User represents a API user.
type User struct {
ID int64 `json:"id"`
- UserName string `json:"login"`
+ UserName string `json:"username"` // LEGACY [Gogs 1.0]: remove field(s) for backward compatibility
+ Login string `json:"login"`
FullName string `json:"full_name"`
Email string `json:"email"`
AvatarUrl string `json:"avatar_url"`
}
-// MarshalJSON implements the json.Marshaler interface for User
-func (u User) MarshalJSON() ([]byte, error) {
- // Re-declaring User to avoid recursion
- type shadow User
- return json.Marshal(struct {
- shadow
- // LEGACY [Gogs 1.0]: remove field(s) for backward compatibility
- CompatUserName string `json:"username"`
- }{shadow(u), u.UserName})
-}
-
func (c *Client) GetUserInfo(user string) (*User, error) {
u := new(User)
err := c.getParsedResponse("GET", fmt.Sprintf("/users/%s", user), nil, nil, u)