Skip to content

Commit 967335e

Browse files
davidsvantessondavidsvantesson
authored
Merge branch 'master' into api-repository-advanced-settings
2 parents 610c6de + cf170bf commit 967335e

File tree

178 files changed

+5214
-1494
lines changed

Some content is hidden

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

178 files changed

+5214
-1494
lines changed

‎Makefile

Lines changed: 87 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -204,94 +204,140 @@ test-sqlite\#%: integrations.sqlite.test
204204
test-sqlite-migration: migrations.sqlite.test
205205
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./migrations.sqlite.test
206206

207-
generate-ini:
207+
generate-ini-mysql:
208208
sed -e 's|{{TEST_MYSQL_HOST}}|${TEST_MYSQL_HOST}|g' \
209209
-e 's|{{TEST_MYSQL_DBNAME}}|${TEST_MYSQL_DBNAME}|g' \
210210
-e 's|{{TEST_MYSQL_USERNAME}}|${TEST_MYSQL_USERNAME}|g' \
211211
-e 's|{{TEST_MYSQL_PASSWORD}}|${TEST_MYSQL_PASSWORD}|g' \
212212
integrations/mysql.ini.tmpl > integrations/mysql.ini
213+
214+
.PHONY: test-mysql
215+
test-mysql: integrations.mysql.test generate-ini-mysql
216+
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.mysql.test
217+
218+
.PHONY: test-mysql\#%
219+
test-mysql\#%: integrations.mysql.test generate-ini-mysql
220+
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.mysql.test -test.run $*
221+
222+
.PHONY: test-mysql-migration
223+
test-mysql-migration: migrations.mysql.test generate-ini-mysql
224+
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./migrations.mysql.test
225+
226+
227+
generate-ini-mysql8:
213228
sed -e 's|{{TEST_MYSQL8_HOST}}|${TEST_MYSQL8_HOST}|g' \
214229
-e 's|{{TEST_MYSQL8_DBNAME}}|${TEST_MYSQL8_DBNAME}|g' \
215230
-e 's|{{TEST_MYSQL8_USERNAME}}|${TEST_MYSQL8_USERNAME}|g' \
216231
-e 's|{{TEST_MYSQL8_PASSWORD}}|${TEST_MYSQL8_PASSWORD}|g' \
217232
integrations/mysql8.ini.tmpl > integrations/mysql8.ini
233+
234+
.PHONY: test-mysql8
235+
test-mysql8: integrations.mysql8.test generate-ini-mysql8
236+
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql8.ini ./integrations.mysql8.test
237+
238+
.PHONY: test-mysql8\#%
239+
test-mysql8\#%: integrations.mysql8.test generate-ini-mysql8
240+
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql8.ini ./integrations.mysql8.test -test.run $*
241+
242+
.PHONY: test-mysql8-migration
243+
test-mysql8-migration: migrations.mysql8.test generate-ini-mysql8
244+
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql8.ini ./migrations.mysql8.test
245+
246+
247+
generate-ini-pgsql:
218248
sed -e 's|{{TEST_PGSQL_HOST}}|${TEST_PGSQL_HOST}|g' \
219249
-e 's|{{TEST_PGSQL_DBNAME}}|${TEST_PGSQL_DBNAME}|g' \
220250
-e 's|{{TEST_PGSQL_USERNAME}}|${TEST_PGSQL_USERNAME}|g' \
221251
-e 's|{{TEST_PGSQL_PASSWORD}}|${TEST_PGSQL_PASSWORD}|g' \
222252
integrations/pgsql.ini.tmpl > integrations/pgsql.ini
223-
sed -e 's|{{TEST_MSSQL_HOST}}|${TEST_MSSQL_HOST}|g' \
224-
-e 's|{{TEST_MSSQL_DBNAME}}|${TEST_MSSQL_DBNAME}|g' \
225-
-e 's|{{TEST_MSSQL_USERNAME}}|${TEST_MSSQL_USERNAME}|g' \
226-
-e 's|{{TEST_MSSQL_PASSWORD}}|${TEST_MSSQL_PASSWORD}|g' \
227-
integrations/mssql.ini.tmpl > integrations/mssql.ini
228-
229-
.PHONY: test-mysql
230-
test-mysql: integrations.test generate-ini
231-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.test
232253

233-
.PHONY: test-mysql-migration
234-
test-mysql-migration: migrations.test generate-ini
235-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./migrations.test
254+
.PHONY: test-pgsql
255+
test-pgsql: integrations.pgsql.test generate-ini-pgsql
256+
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./integrations.pgsql.test
236257

237-
.PHONY: test-mysql8
238-
test-mysql8: integrations.test generate-ini
239-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql8.ini ./integrations.test
258+
.PHONY: test-pgsql\#%
259+
test-pgsql\#%: integrations.pgsql.test generate-ini-pgsql
260+
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./integrations.pgsql.test -test.run $*
240261

241-
.PHONY: test-mysql8-migration
242-
test-mysql8-migration: migrations.test generate-ini
243-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql8.ini ./migrations.test
262+
.PHONY: test-pgsql-migration
263+
test-pgsql-migration: migrations.pgsql.test generate-ini-pgsql
264+
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./migrations.pgsql.test
244265

245-
.PHONY: test-pgsql
246-
test-pgsql: integrations.test generate-ini
247-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./integrations.test
248266

249-
.PHONY: test-pgsql-migration
250-
test-pgsql-migration: migrations.test generate-ini
251-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./migrations.test
267+
generate-ini-mssql:
268+
sed -e 's|{{TEST_MSSQL_HOST}}|${TEST_MSSQL_HOST}|g' \
269+
-e 's|{{TEST_MSSQL_DBNAME}}|${TEST_MSSQL_DBNAME}|g' \
270+
-e 's|{{TEST_MSSQL_USERNAME}}|${TEST_MSSQL_USERNAME}|g' \
271+
-e 's|{{TEST_MSSQL_PASSWORD}}|${TEST_MSSQL_PASSWORD}|g' \
272+
integrations/mssql.ini.tmpl > integrations/mssql.ini
252273

253274
.PHONY: test-mssql
254-
test-mssql: integrations.test generate-ini
255-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mssql.ini ./integrations.test
275+
test-mssql: integrations.mssql.test generate-ini-mssql
276+
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mssql.ini ./integrations.mssql.test
277+
278+
.PHONY: test-mssql\#%
279+
test-mssql\#%: integrations.mssql.test generate-ini-mssql
280+
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mssql.ini ./integrations.mssql.test -test.run $*
256281

257282
.PHONY: test-mssql-migration
258-
test-mssql-migration: migrations.test generate-ini
259-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mssql.ini ./migrations.test
283+
test-mssql-migration: migrations.mssql.test generate-ini-mssql
284+
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mssql.ini ./migrations.mssql.test
260285

261286

262287
.PHONY: bench-sqlite
263288
bench-sqlite: integrations.sqlite.test
264289
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench .
265290

266291
.PHONY: bench-mysql
267-
bench-mysql: integrations.test generate-ini
268-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench .
292+
bench-mysql: integrations.mysql.test generate-ini-mysql
293+
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.mysql.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench .
269294

270295
.PHONY: bench-mssql
271-
bench-mssql: integrations.test generate-ini
272-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mssql.ini ./integrations.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench .
296+
bench-mssql: integrations.mssql.test generate-ini-mssql
297+
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mssql.ini ./integrations.mssql.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench .
273298

274299
.PHONY: bench-pgsql
275-
bench-pgsql: integrations.test generate-ini
276-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./integrations.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench .
300+
bench-pgsql: integrations.pgsql.test generate-ini-pgsql
301+
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./integrations.pgsql.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench .
277302

278303

279304
.PHONY: integration-test-coverage
280-
integration-test-coverage: integrations.cover.test generate-ini
305+
integration-test-coverage: integrations.cover.test generate-ini-mysql
281306
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.cover.test -test.coverprofile=integration.coverage.out
282307

283-
integrations.test: $(SOURCES)
284-
GO111MODULE=on $(GO) test -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.test
308+
integrations.mysql.test: $(SOURCES)
309+
GO111MODULE=on $(GO) test -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.mysql.test
310+
311+
integrations.mysql8.test: $(SOURCES)
312+
GO111MODULE=on $(GO) test -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.mysql8.test
313+
314+
integrations.pgsql.test: $(SOURCES)
315+
GO111MODULE=on $(GO) test -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.pgsql.test
316+
317+
integrations.mssql.test: $(SOURCES)
318+
GO111MODULE=on $(GO) test -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.mssql.test
285319

286320
integrations.sqlite.test: $(SOURCES)
287321
GO111MODULE=on $(GO) test -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.sqlite.test -tags 'sqlite sqlite_unlock_notify'
288322

289323
integrations.cover.test: $(SOURCES)
290324
GO111MODULE=on $(GO) test -mod=vendor -c code.gitea.io/gitea/integrations -coverpkg $(shell echo $(PACKAGES) | tr ' ' ',') -o integrations.cover.test
291325

292-
.PHONY: migrations.test
293-
migrations.test: $(SOURCES)
294-
$(GO) test -c code.gitea.io/gitea/integrations/migration-test -o migrations.test
326+
.PHONY: migrations.mysql.test
327+
migrations.mysql.test: $(SOURCES)
328+
$(GO) test -c code.gitea.io/gitea/integrations/migration-test -o migrations.mysql.test
329+
330+
.PHONY: migrations.mysql8.test
331+
migrations.mysql8.test: $(SOURCES)
332+
$(GO) test -c code.gitea.io/gitea/integrations/migration-test -o migrations.mysql8.test
333+
334+
.PHONY: migrations.pgsql.test
335+
migrations.pgsql.test: $(SOURCES)
336+
$(GO) test -c code.gitea.io/gitea/integrations/migration-test -o migrations.pgsql.test
337+
338+
.PHONY: migrations.mssql.test
339+
migrations.mssql.test: $(SOURCES)
340+
$(GO) test -c code.gitea.io/gitea/integrations/migration-test -o migrations.mssql.test
295341

296342
.PHONY: migrations.sqlite.test
297343
migrations.sqlite.test: $(SOURCES)

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
[![GitHub release](https://img.shields.io/github/release/go-gitea/gitea.svg)](https://github.com/go-gitea/gitea/releases/latest)
1212
[![Help Contribute to Open Source](https://www.codetriage.com/go-gitea/gitea/badges/users.svg)](https://www.codetriage.com/go-gitea/gitea)
1313
[![Become a backer/sponsor of gitea](https://opencollective.com/gitea/tiers/backers/badge.svg?label=backer&color=brightgreen)](https://opencollective.com/gitea)
14+
[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
1415

1516
## Purpose
1617

‎README_ZH.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
[![GoDoc](https://godoc.org/code.gitea.io/gitea?status.svg)](https://godoc.org/code.gitea.io/gitea)
1111
[![GitHub release](https://img.shields.io/github/release/go-gitea/gitea.svg)](https://github.com/go-gitea/gitea/releases/latest)
1212
[![Become a backer/sponsor of gitea](https://opencollective.com/gitea/tiers/backers/badge.svg?label=backer&color=brightgreen)](https://opencollective.com/gitea)
13+
[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
1314

1415
## 目标
1516

‎docs/content/doc/advanced/config-cheat-sheet.en-us.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`.
293293
- `HOST`: **\<empty\>**: Connection string for `redis` and `memcache`.
294294
- Redis: `network=tcp,addr=127.0.0.1:6379,password=macaron,db=0,pool_size=100,idle_timeout=180`
295295
- Memache: `127.0.0.1:9090;127.0.0.1:9091`
296+
- `ITEM_TTL`: **16h**: Time to keep items in cache if not used, Setting it to 0 disables caching.
296297

297298
## Session (`session`)
298299

‎docs/content/doc/advanced/config-cheat-sheet.zh-cn.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,12 @@ menu:
144144

145145
## Cache (`cache`)
146146

147-
- `ADAPTER`: 缓存引擎，可以为 `memory`, `redis` 或 `memcache`。
148-
- `INTERVAL`: 只对内存缓存有效，GC间隔，单位秒。
149-
- `HOST`: 针对redis和memcache有效，主机地址和端口。
147+
- `ADAPTER`: **memory**: 缓存引擎，可以为 `memory`, `redis` 或 `memcache`。
148+
- `INTERVAL`: **60**: 只对内存缓存有效，GC间隔，单位秒。
149+
- `HOST`: **\<empty\>**: 针对redis和memcache有效，主机地址和端口。
150150
- Redis: `network=tcp,addr=127.0.0.1:6379,password=macaron,db=0,pool_size=100,idle_timeout=180`
151151
- Memache: `127.0.0.1:9090;127.0.0.1:9091`
152+
- `ITEM_TTL`: **16h**: 缓存项目失效时间，设置为 0 则禁用缓存。
152153

153154
## Session (`session`)
154155

‎docs/content/doc/advanced/customizing-gitea.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ the url `http://gitea.domain.tld/image.png`.
6060

6161
## Changing the default avatar
6262

63-
Place the png image at the following path: `custom/public/img/avatar\_default.png`
63+
Place the png image at the following path: `custom/public/img/avatar_default.png`
6464

6565
## Customizing Gitea pages
6666

‎docs/content/doc/advanced/external-renderers.en-us.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ In order to get file rendering through external binaries, their associated packa
2828
If you're using a Docker image, your `Dockerfile` should contain something along this lines:
2929

3030
```
31-
FROM gitea/gitea:1.6.0
31+
FROM gitea/gitea:{{< version >}}
3232
[...]
3333
3434
COPY custom/app.ini /data/gitea/conf/app.ini
3535
[...]
3636
37-
RUN apk --no-cache add asciidoctor freetype freetype-dev gcc g++ libpng python-dev py-pip python3-dev py3-pip
37+
RUN apk --no-cache add asciidoctor freetype freetype-dev gcc g++ libpng python-dev py-pip python3-dev py3-pip py3-zmq
3838
# install any other package you need for your external renderers
3939
4040
RUN pip3 install --upgrade pip

‎docs/content/doc/advanced/hacking-on-gitea.en-us.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,10 @@ and look at our
108108
[`.drone.yml`](https://github.com/go-gitea/gitea/blob/master/.drone.yml) to see
109109
how our continuous integration works.
110110

111-
### Formatting, linting, vetting and spell-check
111+
### Formatting, code analysis and spell check
112112

113113
Our continous integration will reject PRs that are not properly formatted, fail
114-
linting, vet or spell-check.
114+
code analysis or spell check.
115115

116116
You should format your code with `go fmt` using:
117117

@@ -130,10 +130,10 @@ You should run the same version of go that is on the continuous integration
130130
server as mentioned above. `make fmt-check` will only check if your `go` would
131131
format differently - this may be different from the CI server version.
132132

133-
You should lint, vet and spell-check with:
133+
You should run revive, vet and spell-check on the code with:
134134

135135
```bash
136-
make vet lint misspell-check
136+
make revive vet misspell-check
137137
```
138138

139139
### Updating CSS
@@ -178,7 +178,7 @@ make generate-swagger
178178
You should validate your generated Swagger file and spell-check it with:
179179

180180
```bash
181-
make swagger-validate mispell-check
181+
make swagger-validate misspell-check
182182
```
183183

184184
You should commit the changed swagger JSON file. The continous integration

‎docs/content/doc/help/faq.en-us.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ Also see [Support Options]({{< relref "doc/help/seek-help.en-us.md" >}})
2828
* [What is Swagger?](#what-is-swagger)
2929
* [Adjusting your server for public/private use](#adjusting-your-server-for-public-private-use)
3030
* [Preventing spammers](#preventing-spammers)
31-
* [Only allow/block certain email domains](#only-allow-block-certain-email-domains)
31+
* [Only allow certain email domains](#only-allow-certain-email-domains)
32+
* [Only allow/block certain OpenID providers](#only-allow-block-certain-openid-providers)
3233
* [Issue only users](#issue-only-users)
3334
* [Enable Fail2ban](#enable-fail2ban)
3435
* [Adding custom themes](#how-to-add-use-custom-themes)
@@ -133,8 +134,11 @@ There are multiple things you can combine to prevent spammers.
133134
2. Setting `ENABLE_CAPTCHA` to `true` in your `app.ini` and properly configuring `RECAPTCHA_SECRET` and `RECAPTCHA_SITEKEY`
134135
3. Settings `DISABLE_REGISTRATION` to `true` and creating new users via the [CLI]({{< relref "doc/usage/command-line.en-us.md" >}}), [API]({{< relref "doc/advanced/api-usage.en-us.md" >}}), or Gitea's Admin UI
135136

136-
### Only allow/block certain email domains
137-
If using OpenID, you can configure `WHITELISTED_URIS` or `BLACKLISTED_URIS` in your `app.ini`
137+
### Only allow certain email domains
138+
You can configure `EMAIL_DOMAIN_WHITELIST` in your app.ini under `[service]`
139+
140+
### Only allow/block certain OpenID providers
141+
You can configure `WHITELISTED_URIS` or `BLACKLISTED_URIS` under `[openid]` in your `app.ini`
138142
**NOTE:** whitelisted takes precedence, so if it is non-blank then blacklisted is ignored
139143

140144
### Issue only users

‎docs/content/doc/usage/backup-and-restore.en-us.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,9 @@ mysql -u$USER -p$PASS $DATABASE <gitea-db.sql
7979
# or sqlite3 $DATABASE_PATH <gitea-db.sql
8080
service gitea restart
8181
```
82+
83+
Repository git-hooks should be regenerated if installation method is changed (eg. binary -> Docker), or if Gitea is installed to a different directory than the previous installation.
84+
85+
With Gitea running, and from the directory Gitea's binary is located, execute: `./gitea admin regenerate hooks`
86+
87+
This ensures that application and configuration file paths in repository git-hooks are consistent and applicable to the current installation. If these paths are not updated, repository `push` actions will fail.

‎go.mod

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ require (
4848
github.com/go-redis/redis v6.15.2+incompatible
4949
github.com/go-sql-driver/mysql v1.4.1
5050
github.com/go-swagger/go-swagger v0.20.1
51-
github.com/go-xorm/xorm v0.7.7-0.20190822154023-17592d96b35b
51+
github.com/go-xorm/xorm v0.7.8
5252
github.com/gobwas/glob v0.2.3
5353
github.com/gogits/chardet v0.0.0-20150115103509-2404f7772561
5454
github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14
@@ -80,6 +80,7 @@ require (
8080
github.com/nfnt/resize v0.0.0-20160724205520-891127d8d1b5
8181
github.com/oliamb/cutter v0.2.2
8282
github.com/philhofer/fwd v1.0.0 // indirect
83+
github.com/pkg/errors v0.8.1
8384
github.com/pquerna/otp v0.0.0-20160912161815-54653902c20e
8485
github.com/prometheus/client_golang v1.1.0
8586
github.com/prometheus/procfs v0.0.4 // indirect
@@ -123,6 +124,6 @@ require (
123124
gopkg.in/testfixtures.v2 v2.5.0
124125
mvdan.cc/xurls/v2 v2.0.0
125126
strk.kbt.io/projects/go/libravatar v0.0.0-20160628055650-5eed7bff870a
126-
xorm.io/builder v0.3.5
127-
xorm.io/core v0.7.0
127+
xorm.io/builder v0.3.6
128+
xorm.io/core v0.7.2
128129
)

‎go.sum

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,10 +250,11 @@ github.com/go-swagger/scan-repo-boundary v0.0.0-20180623220736-973b3573c013/go.m
250250
github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:9wScpmSP5A3Bk8V3XHWUcJmYTh+ZnlHVyc+A4oZYS3Y=
251251
github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM=
252252
github.com/go-xorm/xorm v0.7.6/go.mod h1:nqz2TAsuOHWH2yk4FYWtacCGgdbrcdZ5mF1XadqEHls=
253-
github.com/go-xorm/xorm v0.7.7-0.20190822154023-17592d96b35b h1:Y0hWUheXDHpIs7BWtJcykO4d1VOsVDKg1PsP5YJwxxM=
254-
github.com/go-xorm/xorm v0.7.7-0.20190822154023-17592d96b35b/go.mod h1:nqz2TAsuOHWH2yk4FYWtacCGgdbrcdZ5mF1XadqEHls=
253+
github.com/go-xorm/xorm v0.7.8 h1:rKxZJB9mWQ9Nw2TbjsepiThR031jkGePOWXwTtEAU08=
254+
github.com/go-xorm/xorm v0.7.8/go.mod h1:XiVxrMMIhFkwSkh96BW7PACl7UhLtx2iJIHMdmjh5sQ=
255255
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
256256
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
257+
github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
257258
github.com/gogits/chardet v0.0.0-20150115103509-2404f7772561 h1:deE7ritpK04PgtpyVOS2TYcQEld9qLCD5b5EbVNOuLA=
258259
github.com/gogits/chardet v0.0.0-20150115103509-2404f7772561/go.mod h1:YgYOrVn3Nj9Tq0EvjmFbphRytDj7JNRoWSStJZWDJTQ=
259260
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
@@ -340,6 +341,7 @@ github.com/jackc/pgx v3.3.0+incompatible h1:Wa90/+qsITBAPkAZjiByeIGHFcj3Ztu+Vzrr
340341
github.com/jackc/pgx v3.3.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
341342
github.com/jackc/pgx v3.5.0+incompatible h1:BRJ4G3UPtvml5R1ey0biqqGuYUGayMYekm3woO75orY=
342343
github.com/jackc/pgx v3.5.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
344+
github.com/jackc/pgx v3.6.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
343345
github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod h1:ks+b9deReOc7jgqp+e7LuFiCBH6Rm5hL32cLcEAArb4=
344346
github.com/jaytaylor/html2text v0.0.0-20160923191438-8fb95d837f7d h1:ig/iUfDDg06RVW8OMby+GrmW6K2nPO3AFHlEIdvJSd4=
345347
github.com/jaytaylor/html2text v0.0.0-20160923191438-8fb95d837f7d/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
@@ -818,5 +820,11 @@ strk.kbt.io/projects/go/libravatar v0.0.0-20160628055650-5eed7bff870a h1:8q33Shx
818820
strk.kbt.io/projects/go/libravatar v0.0.0-20160628055650-5eed7bff870a/go.mod h1:FJGmPh3vz9jSos1L/F91iAgnC/aejc0wIIrF2ZwJxdY=
819821
xorm.io/builder v0.3.5 h1:EilU39fvWDxjb1cDaELpYhsF+zziRBhew8xk4pngO+A=
820822
xorm.io/builder v0.3.5/go.mod h1:ZFbByS/KxZI1FKRjL05PyJ4YrK2bcxlUaAxdum5aTR8=
823+
xorm.io/builder v0.3.6 h1:ha28mQ2M+TFx96Hxo+iq6tQgnkC9IZkM6D8w9sKHHF8=
824+
xorm.io/builder v0.3.6/go.mod h1:LEFAPISnRzG+zxaxj2vPicRwz67BdhFreKg8yv8/TgU=
821825
xorm.io/core v0.7.0 h1:hKxuOKWZNeiFQsSuGet/KV8HZ788hclvAl+7azx3tkM=
822826
xorm.io/core v0.7.0/go.mod h1:TuOJjIVa7e3w/rN8tDcAvuLBMtwzdHPbyOzE6Gk1EUI=
827+
xorm.io/core v0.7.2-0.20190928055935-90aeac8d08eb h1:msX3zG3BPl8Ti+LDzP33/9K7BzO/WqFXk610K1kYKfo=
828+
xorm.io/core v0.7.2-0.20190928055935-90aeac8d08eb/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM=
829+
xorm.io/core v0.7.2 h1:mEO22A2Z7a3fPaZMk6gKL/jMD80iiyNwRrX5HOv3XLw=
830+
xorm.io/core v0.7.2/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM=

0 commit comments

Comments
 (0)