Skip to content

Commit 9983632

Browse files
Merge branch 'go-gitea:main' into Badge
2 parents e9f6d4b + 8de8972 commit 9983632

File tree

227 files changed

+2958
-1427
lines changed

Some content is hidden

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

227 files changed

+2958
-1427
lines changed

.devcontainer/devcontainer.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
"ghcr.io/devcontainers-contrib/features/poetry:2": {},
1111
"ghcr.io/devcontainers/features/python:1": {
1212
"version": "3.12"
13-
}
13+
},
14+
"ghcr.io/warrenbuckley/codespace-features/sqlite:1": {}
1415
},
1516
"customizations": {
1617
"vscode": {
@@ -25,8 +26,9 @@
2526
"Vue.volar",
2627
"ms-azuretools.vscode-docker",
2728
"vitest.explorer",
28-
"qwtel.sqlite-viewer",
29-
"GitHub.vscode-pull-request-github"
29+
"cweijan.vscode-database-client2",
30+
"GitHub.vscode-pull-request-github",
31+
"Azurite.azurite"
3032
]
3133
}
3234
},

.gitea/issue_template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!--
44
1. Please speak English, this is the language all maintainers can speak and write.
55
2. Please ask questions or configuration/deploy problems on our Discord
6-
server (https://discord.gg/gitea) or forum (https://discourse.gitea.io).
6+
server (https://discord.gg/gitea) or forum (https://forum.gitea.com).
77
3. Please take a moment to check that your issue doesn't already exist.
88
4. Make sure it's not mentioned in the FAQ (https://docs.gitea.com/help/faq)
99
5. Please give all relevant information below for bug reports, because
@@ -21,7 +21,7 @@
2121
- [ ] MySQL
2222
- [ ] MSSQL
2323
- [ ] SQLite
24-
- Can you reproduce the bug at https://try.gitea.io:
24+
- Can you reproduce the bug at https://demo.gitea.com:
2525
- [ ] Yes (provide example URL)
2626
- [ ] No
2727
- Log gist:

.github/ISSUE_TEMPLATE/bug-report.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ body:
3737
label: Can you reproduce the bug on the Gitea demo site?
3838
description: |
3939
If so, please provide a URL in the Description field
40-
URL of Gitea demo: https://try.gitea.io
40+
URL of Gitea demo: https://demo.gitea.com
4141
options:
4242
- "Yes"
4343
- "No"
@@ -74,7 +74,7 @@ body:
7474
attributes:
7575
label: How are you running Gitea?
7676
description: |
77-
Please include information on whether you built Gitea yourself, used one of our downloads, are using https://try.gitea.io or are using some other package
77+
Please include information on whether you built Gitea yourself, used one of our downloads, are using https://demo.gitea.com or are using some other package
7878
Please also tell us how you are running Gitea, e.g. if it is being run from docker, a command-line, systemd etc.
7979
If you are using a package or systemd tell us what distribution you are using
8080
validations:

.github/ISSUE_TEMPLATE/ui.bug-report.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ body:
4646
label: Can you reproduce the bug on the Gitea demo site?
4747
description: |
4848
If so, please provide a URL in the Description field
49-
URL of Gitea demo: https://try.gitea.io
49+
URL of Gitea demo: https://demo.gitea.com
5050
options:
5151
- "Yes"
5252
- "No"

.github/workflows/pull-db-tests.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,18 @@ jobs:
119119
MINIO_SECRET_KEY: 12345678
120120
ports:
121121
- "9000:9000"
122+
devstoreaccount1.azurite.local: # https://github.com/Azure/Azurite/issues/1583
123+
image: mcr.microsoft.com/azure-storage/azurite:latest
124+
ports:
125+
- 10000:10000
122126
steps:
123127
- uses: actions/checkout@v4
124128
- uses: actions/setup-go@v5
125129
with:
126130
go-version-file: go.mod
127131
check-latest: true
128132
- name: Add hosts to /etc/hosts
129-
run: '[ -e "/.dockerenv" ] || [ -e "/run/.containerenv" ] || echo "127.0.0.1 mysql elasticsearch meilisearch smtpimap" | sudo tee -a /etc/hosts'
133+
run: '[ -e "/.dockerenv" ] || [ -e "/run/.containerenv" ] || echo "127.0.0.1 minio devstoreaccount1.azurite.local mysql elasticsearch meilisearch smtpimap" | sudo tee -a /etc/hosts'
130134
- run: make deps-backend
131135
- run: make backend
132136
env:
@@ -204,14 +208,18 @@ jobs:
204208
SA_PASSWORD: MwantsaSecurePassword1
205209
ports:
206210
- "1433:1433"
211+
devstoreaccount1.azurite.local: # https://github.com/Azure/Azurite/issues/1583
212+
image: mcr.microsoft.com/azure-storage/azurite:latest
213+
ports:
214+
- 10000:10000
207215
steps:
208216
- uses: actions/checkout@v4
209217
- uses: actions/setup-go@v5
210218
with:
211219
go-version-file: go.mod
212220
check-latest: true
213221
- name: Add hosts to /etc/hosts
214-
run: '[ -e "/.dockerenv" ] || [ -e "/run/.containerenv" ] || echo "127.0.0.1 mssql" | sudo tee -a /etc/hosts'
222+
run: '[ -e "/.dockerenv" ] || [ -e "/run/.containerenv" ] || echo "127.0.0.1 mssql devstoreaccount1.azurite.local" | sudo tee -a /etc/hosts'
215223
- run: make deps-backend
216224
- run: make backend
217225
env:

.gitpod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ vscode:
4343
- Vue.volar
4444
- ms-azuretools.vscode-docker
4545
- vitest.explorer
46-
- qwtel.sqlite-viewer
46+
- cweijan.vscode-database-client2
4747
- GitHub.vscode-pull-request-github
4848

4949
ports:

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ If your issue has not been reported yet, [open an issue](https://github.com/go-g
7777
and answer the questions so we can understand and reproduce the problematic behavior. \
7878
Please write clear and concise instructions so that we can reproduce the behavior — even if it seems obvious. \
7979
The more detailed and specific you are, the faster we can fix the issue. \
80-
It is really helpful if you can reproduce your problem on a site running on the latest commits, i.e. <https://try.gitea.io>, as perhaps your problem has already been fixed on a current version. \
80+
It is really helpful if you can reproduce your problem on a site running on the latest commits, i.e. <https://demo.gitea.com>, as perhaps your problem has already been fixed on a current version. \
8181
Please follow the guidelines described in [How to Report Bugs Effectively](http://www.chiark.greenend.org.uk/~sgtatham/bugs.html) for your report.
8282

8383
Please be kind, remember that Gitea comes at no cost to you, and you're getting free help.
@@ -362,7 +362,7 @@ If you add a new feature or change an existing aspect of Gitea, the documentatio
362362

363363
## API v1
364364

365-
The API is documented by [swagger](http://try.gitea.io/api/swagger) and is based on [the GitHub API](https://docs.github.com/en/rest).
365+
The API is documented by [swagger](https://gitea.com/api/swagger) and is based on [the GitHub API](https://docs.github.com/en/rest).
366366

367367
### GitHub API compatibility
368368

Makefile

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,18 @@ COMMA := ,
2525

2626
XGO_VERSION := go-1.22.x
2727

28-
AIR_PACKAGE ?= github.com/cosmtrek/air@v1
28+
AIR_PACKAGE ?= github.com/air-verse/air@v1
2929
EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/cmd/editorconfig-checker@2.7.0
3030
GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.6.0
31-
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.57.2
31+
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.59.0
3232
GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.11
3333
MISSPELL_PACKAGE ?= github.com/golangci/misspell/cmd/misspell@v0.5.1
3434
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@db51e79a0e37c572d8b59ae0c58bf2bbbbe53285
3535
XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest
3636
GO_LICENSES_PACKAGE ?= github.com/google/go-licenses@v1
3737
GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1
3838
ACTIONLINT_PACKAGE ?= github.com/rhysd/actionlint/cmd/actionlint@v1
39+
GOPLS_PACKAGE ?= golang.org/x/tools/gopls@v0.15.3
3940

4041
DOCKER_IMAGE ?= gitea/gitea
4142
DOCKER_TAG ?= latest
@@ -213,6 +214,7 @@ help:
213214
@echo " - lint-go lint go files"
214215
@echo " - lint-go-fix lint go files and fix issues"
215216
@echo " - lint-go-vet lint go files with vet"
217+
@echo " - lint-go-gopls lint go files with gopls"
216218
@echo " - lint-js lint js files"
217219
@echo " - lint-js-fix lint js files and fix issues"
218220
@echo " - lint-css lint css files"
@@ -366,7 +368,7 @@ lint-frontend: lint-js lint-css
366368
lint-frontend-fix: lint-js-fix lint-css-fix
367369

368370
.PHONY: lint-backend
369-
lint-backend: lint-go lint-go-vet lint-editorconfig
371+
lint-backend: lint-go lint-go-vet lint-go-gopls lint-editorconfig
370372

371373
.PHONY: lint-backend-fix
372374
lint-backend-fix: lint-go-fix lint-go-vet lint-editorconfig
@@ -424,6 +426,11 @@ lint-go-vet:
424426
@GOOS= GOARCH= $(GO) build code.gitea.io/gitea-vet
425427
@$(GO) vet -vettool=gitea-vet ./...
426428

429+
.PHONY: lint-go-gopls
430+
lint-go-gopls:
431+
@echo "Running gopls check..."
432+
@GO=$(GO) GOPLS_PACKAGE=$(GOPLS_PACKAGE) tools/lint-go-gopls.sh $(GO_SOURCES_NO_BINDATA)
433+
427434
.PHONY: lint-editorconfig
428435
lint-editorconfig:
429436
@$(GO) run $(EDITORCONFIG_CHECKER_PACKAGE) $(EDITORCONFIG_FILES)
@@ -864,6 +871,7 @@ deps-tools:
864871
$(GO) install $(GO_LICENSES_PACKAGE)
865872
$(GO) install $(GOVULNCHECK_PACKAGE)
866873
$(GO) install $(ACTIONLINT_PACKAGE)
874+
$(GO) install $(GOPLS_PACKAGE)
867875

868876
node_modules: package-lock.json
869877
npm install --no-save

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ This project has been
2626
[forked](https://blog.gitea.com/welcome-to-gitea/) from
2727
[Gogs](https://gogs.io) since November of 2016, but a lot has changed.
2828

29-
For online demonstrations, you can visit [try.gitea.io](https://try.gitea.io).
29+
For online demonstrations, you can visit [demo.gitea.com](https://demo.gitea.com).
3030

3131
For accessing free Gitea service (with a limited number of repositories), you can visit [gitea.com](https://gitea.com/user/login).
3232

@@ -56,7 +56,7 @@ More info: https://docs.gitea.com/installation/install-from-source
5656
./gitea web
5757

5858
> [!NOTE]
59-
> If you're interested in using our APIs, we have experimental support with [documentation](https://try.gitea.io/api/swagger).
59+
> If you're interested in using our APIs, we have experimental support with [documentation](https://docs.gitea.com/api).
6060
6161
## Contributing
6262

@@ -80,7 +80,7 @@ https://docs.gitea.com/contributing/localization
8080
## Further information
8181

8282
For more information and instructions about how to install Gitea, please look at our [documentation](https://docs.gitea.com/).
83-
If you have questions that are not covered by the documentation, you can get in contact with us on our [Discord server](https://discord.gg/Gitea) or create a post in the [discourse forum](https://discourse.gitea.io/).
83+
If you have questions that are not covered by the documentation, you can get in contact with us on our [Discord server](https://discord.gg/Gitea) or create a post in the [discourse forum](https://forum.gitea.com/).
8484

8585
We maintain a list of Gitea-related projects at [gitea/awesome-gitea](https://gitea.com/gitea/awesome-gitea).
8686

README_ZH.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
Gitea 的首要目标是创建一个极易安装,运行非常快速,安装和使用体验良好的自建 Git 服务。我们采用 Go 作为后端语言,这使我们只要生成一个可执行程序即可。并且他还支持跨平台,支持 Linux, macOS 和 Windows 以及各种架构,除了 x86,amd64,还包括 ARM 和 PowerPC。
2020

21-
如果你想试用在线演示,请访问 [try.gitea.io](https://try.gitea.io/)
21+
如果你想试用在线演示和报告问题,请访问 [demo.gitea.com](https://demo.gitea.com/)
2222

2323
如果你想使用免费的 Gitea 服务(有仓库数量限制),请访问 [gitea.com](https://gitea.com/user/login)
2424

0 commit comments

Comments
 (0)