Skip to content

Commit 256b178

Browse files
sapksapk
authored
Update swagger to 0.20.1 (#8010)
* update swagger to 0.20.1 * fiw swagger version for validate
1 parent e0f95d1 commit 256b178

File tree

100 files changed

+6452
-1301
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+6452
-1301
lines changed

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ generate:
102102
.PHONY: generate-swagger
103103
generate-swagger:
104104
@hash swagger > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
105-
GO111MODULE="on" $(GO) get -u github.com/go-swagger/go-swagger/cmd/swagger@v0.19.0; \
105+
GO111MODULE="on" $(GO) get -u github.com/go-swagger/go-swagger/cmd/swagger@v0.20.1; \
106106
fi
107107
swagger generate spec -o './$(SWAGGER_SPEC)'
108108
$(SED_INPLACE) '$(SWAGGER_SPEC_S_TMPL)' './$(SWAGGER_SPEC)'
@@ -120,7 +120,7 @@ swagger-check: generate-swagger
120120
.PHONY: swagger-validate
121121
swagger-validate:
122122
@hash swagger > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
123-
$(GO) get -u github.com/go-swagger/go-swagger/cmd/swagger; \
123+
GO111MODULE="on" $(GO) get -u github.com/go-swagger/go-swagger/cmd/swagger@v0.20.1; \
124124
fi
125125
$(SED_INPLACE) '$(SWAGGER_SPEC_S_JSON)' './$(SWAGGER_SPEC)'
126126
swagger validate './$(SWAGGER_SPEC)'

‎go.mod

+15-8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module code.gitea.io/gitea
33
go 1.12
44

55
require (
6+
cloud.google.com/go v0.44.3 // indirect
67
gitea.com/macaron/binding v0.0.0-20190822013154-a5f53841ed2b
78
gitea.com/macaron/cache v0.0.0-20190822004001-a6e7fee4ee76
89
gitea.com/macaron/captcha v0.0.0-20190822015246-daa973478bae
@@ -48,6 +49,8 @@ require (
4849
github.com/go-xorm/xorm v0.7.7-0.20190822154023-17592d96b35b
4950
github.com/gogits/chardet v0.0.0-20150115103509-2404f7772561
5051
github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14
52+
github.com/golang/snappy v0.0.1 // indirect
53+
github.com/google/go-cmp v0.3.1 // indirect
5154
github.com/google/go-github/v24 v24.0.1
5255
github.com/gorilla/context v1.1.1
5356
github.com/issue9/assert v1.3.2 // indirect
@@ -70,13 +73,17 @@ require (
7073
github.com/mattn/go-sqlite3 v1.11.0
7174
github.com/mcuadros/go-version v0.0.0-20190308113854-92cdf37c5b75
7275
github.com/microcosm-cc/bluemonday v0.0.0-20161012083705-f77f16ffc87a
76+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
77+
github.com/modern-go/reflect2 v1.0.1 // indirect
7378
github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae // indirect
7479
github.com/msteinert/pam v0.0.0-20151204160544-02ccfbfaf0cc
7580
github.com/nfnt/resize v0.0.0-20160724205520-891127d8d1b5
7681
github.com/oliamb/cutter v0.2.2
7782
github.com/philhofer/fwd v1.0.0 // indirect
7883
github.com/pquerna/otp v0.0.0-20160912161815-54653902c20e
79-
github.com/prometheus/client_golang v0.9.3
84+
github.com/prometheus/client_golang v1.1.0
85+
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 // indirect
86+
github.com/prometheus/procfs v0.0.4 // indirect
8087
github.com/remyoudompheng/bigfft v0.0.0-20190321074620-2f0d2b0e0001 // indirect
8188
github.com/russross/blackfriday v0.0.0-20180428102519-11635eb403ff
8289
github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca // indirect
@@ -86,7 +93,7 @@ require (
8693
github.com/shurcooL/sanitized_anchor_name v0.0.0-20160918041101-1dba4b3954bc // indirect
8794
github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd
8895
github.com/steveyen/gtreap v0.0.0-20150807155958-0abe01ef9be2 // indirect
89-
github.com/stretchr/testify v1.3.0
96+
github.com/stretchr/testify v1.4.0
9097
github.com/tecbot/gorocksdb v0.0.0-20181010114359-8752a9433481 // indirect
9198
github.com/tinylib/msgp v0.0.0-20180516164116-c8cf64dff200 // indirect
9299
github.com/tstranex/u2f v1.0.0
@@ -97,13 +104,13 @@ require (
97104
github.com/urfave/cli v1.20.0
98105
github.com/willf/bitset v0.0.0-20180426185212-8ce1146b8621 // indirect
99106
github.com/yohcop/openid-go v0.0.0-20160914080427-2c050d2dae53
100-
go.etcd.io/bbolt v1.3.2 // indirect
101-
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
102-
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80
103-
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421
104-
golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3
107+
go.etcd.io/bbolt v1.3.3 // indirect
108+
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586
109+
golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297
110+
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
111+
golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456
105112
golang.org/x/text v0.3.2
106-
golang.org/x/tools v0.0.0-20190731214159-1e85ed8060aa // indirect
113+
golang.org/x/tools v0.0.0-20190827205025-b29f5f60c37a // indirect
107114
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
108115
gopkg.in/asn1-ber.v1 v1.0.0-20150924051756-4e86f4367175 // indirect
109116
gopkg.in/editorconfig/editorconfig-core-go.v1 v1.3.0

‎go.sum

+88-18
Large diffs are not rendered by default.

‎templates/swagger/v1_json.tmpl

+35-2
Original file line numberDiff line numberDiff line change
@@ -6944,6 +6944,30 @@
69446944
},
69456945
"x-go-package": "code.gitea.io/gitea/modules/structs"
69466946
},
6947+
"AccessToken": {
6948+
"type": "object",
6949+
"title": "AccessToken represents an API access token.",
6950+
"properties": {
6951+
"id": {
6952+
"type": "integer",
6953+
"format": "int64",
6954+
"x-go-name": "ID"
6955+
},
6956+
"name": {
6957+
"type": "string",
6958+
"x-go-name": "Name"
6959+
},
6960+
"sha1": {
6961+
"type": "string",
6962+
"x-go-name": "Token"
6963+
},
6964+
"token_last_eight": {
6965+
"type": "string",
6966+
"x-go-name": "TokenLastEight"
6967+
}
6968+
},
6969+
"x-go-package": "code.gitea.io/gitea/modules/structs"
6970+
},
69476971
"AddCollaboratorOption": {
69486972
"description": "AddCollaboratorOption options when adding a user as a collaborator of a repository",
69496973
"type": "object",
@@ -10051,7 +10075,13 @@
1005110075
}
1005210076
},
1005310077
"AccessTokenList": {
10054-
"description": "AccessTokenList represents a list of API access token."
10078+
"description": "AccessTokenList represents a list of API access token.",
10079+
"schema": {
10080+
"type": "array",
10081+
"items": {
10082+
"$ref": "#/definitions/AccessToken"
10083+
}
10084+
}
1005510085
},
1005610086
"AnnotatedTag": {
1005710087
"description": "AnnotatedTag",
@@ -10296,7 +10326,10 @@
1029610326
}
1029710327
},
1029810328
"MarkdownRender": {
10299-
"description": "MarkdownRender is a rendered markdown document"
10329+
"description": "MarkdownRender is a rendered markdown document",
10330+
"schema": {
10331+
"type": "string"
10332+
}
1030010333
},
1030110334
"Milestone": {
1030210335
"description": "Milestone",

‎vendor/cloud.google.com/go/AUTHORS

-15
This file was deleted.

‎vendor/cloud.google.com/go/CONTRIBUTORS

-40
This file was deleted.

‎vendor/github.com/golang/protobuf/proto/properties.go

+2-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/golang/snappy/go.mod

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/prometheus/client_golang/prometheus/build_info.go

+29
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/prometheus/client_golang/prometheus/build_info_pre_1.12.go

+22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/prometheus/client_golang/prometheus/doc.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/prometheus/client_golang/prometheus/go_collector.go

+31-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)