Skip to content

Commit 67bc21d

Browse files
authored
Merge branch 'main' into fix-repo-links
2 parents cbb54ce + fba7150 commit 67bc21d

File tree

336 files changed

+3415
-2869
lines changed

Some content is hidden

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

336 files changed

+3415
-2869
lines changed

.gitea/issue_template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
2. Please ask questions or configuration/deploy problems on our Discord
66
server (https://discord.gg/gitea) or forum (https://discourse.gitea.io).
77
3. Please take a moment to check that your issue doesn't already exist.
8-
4. Make sure it's not mentioned in the FAQ (https://docs.gitea.io/en-us/faq)
8+
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
1010
incomplete details will be handled as an invalid report.
1111
-->
@@ -26,7 +26,7 @@
2626
- [ ] No
2727
- Log gist:
2828
<!-- It really is important to provide pertinent logs -->
29-
<!-- Please read https://docs.gitea.io/en-us/logging-configuration/#debugging-problems -->
29+
<!-- Please read https://docs.gitea.com/administration/logging-config#collecting-logs-for-help -->
3030
<!-- In addition, if your problem relates to git commands set `RUN_MODE=dev` at the top of app.ini -->
3131

3232
## Description

.github/ISSUE_TEMPLATE/bug-report.yaml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Bug Report
22
description: Found something you weren't expecting? Report it here!
3-
labels: kind/bug
3+
labels: ["kind/bug"]
44
body:
55
- type: markdown
66
attributes:
@@ -14,12 +14,9 @@ body:
1414
server (https://discord.gg/gitea) or forum (https://discourse.gitea.io).
1515
3. Make sure you are using the latest release and
1616
take a moment to check that your issue hasn't been reported before.
17-
4. Make sure it's not mentioned in the FAQ (https://docs.gitea.io/en-us/faq)
18-
5. Please give all relevant information below for bug reports, because
17+
4. Make sure it's not mentioned in the FAQ (https://docs.gitea.com/help/faq)
18+
5. It's really important to provide pertinent details and logs (https://docs.gitea.com/help/support),
1919
incomplete details will be handled as an invalid report.
20-
6. In particular it's really important to provide pertinent logs. You must give us DEBUG level logs.
21-
Please read https://docs.gitea.io/en-us/logging-configuration/#debugging-problems
22-
In addition, if your problem relates to git commands set `RUN_MODE=dev` at the top of app.ini
2320
- type: textarea
2421
id: description
2522
attributes:
@@ -50,7 +47,7 @@ body:
5047
attributes:
5148
value: |
5249
It's really important to provide pertinent logs
53-
Please read https://docs.gitea.io/en-us/logging-configuration/#debugging-problems
50+
Please read https://docs.gitea.com/administration/logging-config#collecting-logs-for-help
5451
In addition, if your problem relates to git commands set `RUN_MODE=dev` at the top of app.ini
5552
- type: input
5653
id: logs
@@ -89,6 +86,6 @@ body:
8986
description: What database system are you running?
9087
options:
9188
- PostgreSQL
92-
- MySQL
89+
- MySQL/MariaDB
9390
- MSSQL
9491
- SQLite

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ contact_links:
88
about: Please ask questions and discuss configuration or deployment problems here.
99
- name: Discourse Forum
1010
url: https://discourse.gitea.io
11-
about: Questions and configuration or deployment problems can also be discussed on our forum.
11+
about: Questions and configuration or deployment problems can also be discussed on our forum.
1212
- name: Frequently Asked Questions
13-
url: https://docs.gitea.io/en-us/faq
13+
url: https://docs.gitea.com/help/faq
1414
about: Please check if your question isn't mentioned here.
1515
- name: Crowdin Translations
1616
url: https://crowdin.com/project/gitea

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ body:
1313
2. Please ask questions or configuration/deploy problems on our Discord
1414
server (https://discord.gg/gitea) or forum (https://discourse.gitea.io).
1515
3. Please take a moment to check that your issue doesn't already exist.
16-
4. Make sure it's not mentioned in the FAQ (https://docs.gitea.io/en-us/faq)
16+
4. Make sure it's not mentioned in the FAQ (https://docs.gitea.com/help/faq)
1717
5. Please give all relevant information below for bug reports, because
1818
incomplete details will be handled as an invalid report.
1919
6. In particular it's really important to provide pertinent logs. If you are certain that this is a javascript
2020
error, show us the javascript console. If the error appears to relate to Gitea the server you must also give us
21-
DEBUG level logs. (See https://docs.gitea.io/en-us/logging-configuration/#debugging-problems)
21+
DEBUG level logs. (See https://docs.gitea.com/administration/logging-config#collecting-logs-for-help)
2222
- type: textarea
2323
id: description
2424
attributes:

.github/workflows/files-changed.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ jobs:
4343
- "go.mod"
4444
- "go.sum"
4545
- "Makefile"
46+
- ".golangci.yml"
47+
- ".editorconfig"
4648
4749
frontend:
4850
- "**/*.js"
@@ -51,16 +53,21 @@ jobs:
5153
- "package.json"
5254
- "package-lock.json"
5355
- "Makefile"
56+
- ".eslintrc.yaml"
57+
- ".stylelintrc.yaml"
58+
- ".npmrc"
5459
5560
docs:
5661
- "**/*.md"
5762
- "docs/**"
63+
- ".markdownlint.yaml"
5864
5965
actions:
6066
- ".github/workflows/*"
6167
6268
templates:
6369
- "templates/**/*.tmpl"
70+
- "pyproject.toml"
6471
- "poetry.lock"
6572
6673
docker:
@@ -72,3 +79,6 @@ jobs:
7279
swagger:
7380
- "templates/swagger/v1_json.tmpl"
7481
- "Makefile"
82+
- "package.json"
83+
- "package-lock.json"
84+
- ".spectral.yaml"

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ cpu.out
7575
/public/assets/js
7676
/public/assets/css
7777
/public/assets/fonts
78+
/public/assets/licenses.txt
7879
/public/assets/img/webpack
7980
/vendor
8081
/web_src/fomantic/node_modules

.golangci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ linters:
2929
fast: false
3030

3131
run:
32-
go: "1.20"
32+
go: "1.21"
3333
timeout: 10m
3434
skip-dirs:
3535
- node_modules
@@ -75,7 +75,7 @@ linters-settings:
7575
- name: modifies-value-receiver
7676
gofumpt:
7777
extra-rules: true
78-
lang-version: "1.20"
78+
lang-version: "1.21"
7979
depguard:
8080
rules:
8181
main:

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
## Introduction
6161

6262
This document explains how to contribute changes to the Gitea project. \
63-
It assumes you have followed the [installation instructions](https://docs.gitea.io/en-us/). \
63+
It assumes you have followed the [installation instructions](https://docs.gitea.com/category/installation). \
6464
Sensitive security-related issues should be reported to [[email protected]](mailto:[email protected]).
6565

6666
For configuring IDEs for Gitea development, see the [contributed IDE configurations](contrib/ide/).

README.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@ or if SQLite support is required:
7979

8080
The `build` target is split into two sub-targets:
8181

82-
- `make backend` which requires [Go Stable](https://go.dev/dl/), required version is defined in [go.mod](/go.mod).
83-
- `make frontend` which requires [Node.js LTS](https://nodejs.org/en/download/) or greater and Internet connectivity to download npm dependencies.
82+
- `make backend` which requires [Go Stable](https://go.dev/dl/), the required version is defined in [go.mod](/go.mod).
83+
- `make frontend` which requires [Node.js LTS](https://nodejs.org/en/download/) or greater.
8484

85-
When building from the official source tarballs which include pre-built frontend files, the `frontend` target will not be triggered, making it possible to build without Node.js and Internet connectivity.
85+
Internet connectivity is required to download the go and npm modules. When building from the official source tarballs which include pre-built frontend files, the `frontend` target will not be triggered, making it possible to build without Node.js.
8686

8787
Parallelism (`make -j <num>`) is not supported.
8888

89-
More info: https://docs.gitea.io/en-us/install-from-source/
89+
More info: https://docs.gitea.com/installation/install-from-source
9090

9191
## Using
9292

@@ -121,8 +121,6 @@ If you have questions that are not covered by the documentation, you can get in
121121

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

124-
The Hugo-based documentation theme is hosted at [gitea/theme](https://gitea.com/gitea/theme).
125-
126124
The official Gitea CLI is developed at [gitea/tea](https://gitea.com/gitea/tea).
127125

128126
## Authors

README_ZH.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Gitea 的首要目标是创建一个极易安装,运行非常快速,安装
6868

6969
## 文档
7070

71-
关于如何安装请访问我们的 [文档站](https://docs.gitea.io/zh-cn/),如果没有找到对应的文档,你也可以通过 [Discord - 英文](https://discord.gg/gitea) 和 QQ群 328432459 来和我们交流。
71+
关于如何安装请访问我们的 [文档站](https://docs.gitea.com/zh-cn/category/installation),如果没有找到对应的文档,你也可以通过 [Discord - 英文](https://discord.gg/gitea) 和 QQ群 328432459 来和我们交流。
7272

7373
## 贡献流程
7474

0 commit comments

Comments
 (0)