Skip to content

Commit 482bdb7

Browse files
committed
Merge remote-tracking branch 'upstream/main'
* upstream/main: [skip ci] Updated translations via Crowdin Modify OAuth login ui and fix display name, iconurl related logic (go-gitea#25030) Fix open redirect check for more cases (go-gitea#25143) Update js dependencies (go-gitea#25137) Remove duplicated functions when deleting a branch (go-gitea#25128) Add codeowners feature (go-gitea#24910) Fix strange UI behavior of cancelling dismiss review modal (go-gitea#25133) Fix `MilestoneIDs` when querying issues (go-gitea#25125) Fix incorrect git ignore rule and add missing license files (go-gitea#25135) Change branch name from master to main in some documents' links (go-gitea#25126) Remove incorrect element ID on "post-install" page (go-gitea#25104) [skip ci] Updated translations via Crowdin Improve notification icon and navbar (go-gitea#25111) fix swagger documentation for multiple files API endpoint (go-gitea#25110) Fix webauthn regression and improve code (go-gitea#25113) Add details summary for vertical menus in settings to allow toggling (go-gitea#25098) Fix 500 error caused by notifications without an issue such as repo transfers (go-gitea#25101)
2 parents 046f34e + 6d063a8 commit 482bdb7

File tree

134 files changed

+2264
-2190
lines changed

Some content is hidden

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

134 files changed

+2264
-2190
lines changed

.eslintrc.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ globals:
2929
__webpack_public_path__: true
3030

3131
overrides:
32-
- files: ["web_src/**/*.js", "docs/**/*.js"]
32+
- files: ["web_src/**/*", "docs/**/*"]
3333
env:
3434
browser: true
3535
node: false
36-
- files: ["web_src/**/*worker.js"]
36+
- files: ["web_src/**/*worker.*"]
3737
env:
3838
worker: true
3939
rules:
@@ -42,7 +42,7 @@ overrides:
4242
rules:
4343
import/no-unresolved: [0]
4444
import/no-extraneous-dependencies: [0]
45-
- files: ["*.config.js"]
45+
- files: ["*.config.*"]
4646
rules:
4747
import/no-unused-modules: [0]
4848

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ _test
1616
.vscode
1717
__debug_bin
1818

19-
# Architecture specific extensions/prefixes
20-
*.[568vq]
21-
[568vq].out
22-
2319
*.cgo1.go
2420
*.cgo2.c
2521
_cgo_defun.c

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ Here's how to run the test suite:
174174
## Translation
175175

176176
All translation work happens on [Crowdin](https://crowdin.com/project/gitea).
177-
The only translation that is maintained in this repository is [the English translation](https://github.com/go-gitea/gitea/blob/master/options/locale/locale_en-US.ini).
177+
The only translation that is maintained in this repository is [the English translation](https://github.com/go-gitea/gitea/blob/main/options/locale/locale_en-US.ini).
178178
It is synced regularly with Crowdin. \
179179
Other locales on main branch **should not** be updated manually as they will be overwritten with each sync. \
180180
Once a language has reached a **satisfactory percentage** of translated keys (~25%), it will be synced back into this repo and included in the next released version.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ menu:
1818
# 配置说明
1919

2020
这是针对Gitea配置文件的说明,你可以了解Gitea的强大配置。需要说明的是,你的所有改变请修改 `custom/conf/app.ini` 文件而不是源文件。
21-
所有默认值可以通过 [app.example.ini](https://github.com/go-gitea/gitea/blob/master/custom/conf/app.example.ini) 查看到。
21+
所有默认值可以通过 [app.example.ini](https://github.com/go-gitea/gitea/blob/main/custom/conf/app.example.ini) 查看到。
2222
如果你发现 `%(X)s` 这样的内容,请查看 [ini](https://github.com/go-ini/ini/#recursive-values) 这里的说明。
2323
标注了 :exclamation: 的配置项表明除非你真的理解这个配置项的意义,否则最好使用默认值。
2424

docs/content/doc/administration/customizing-gitea.zh-cn.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Gitea 引用 `custom` 目录中的自定义配置文件来覆盖配置、模板
2424
`custom/conf/app.ini` 当中。在发行版中可能会以 `/etc/gitea/` 的形式为 `custom` 设置一个符号链接,查看配置详情请移步:
2525

2626
- [快速备忘单](https://docs.gitea.io/en-us/config-cheat-sheet/)
27-
- [完整配置清单](https://github.com/go-gitea/gitea/blob/master/custom/conf/app.example.ini)
27+
- [完整配置清单](https://github.com/go-gitea/gitea/blob/main/custom/conf/app.example.ini)
2828

2929
如果您在 binary 同目录下无法找到 `custom` 文件夹,请检查您的 `GITEA_CUSTOM`
3030
环境变量配置, 因为它可能被配置到了其他地方(可能被一些启动脚本设置指定了目录)。
@@ -67,7 +67,7 @@ Gitea 引用 `custom` 目录中的自定义配置文件来覆盖配置、模板
6767

6868
同理,您可以将页签添加到 `extra_tabs.tmpl` 中,使用同样的方式来添加页签。它的具体样式需要与
6969
`templates/repo/header.tmpl` 中已有的其他选项卡的样式匹配
70-
([source in GitHub](https://github.com/go-gitea/gitea/blob/master/templates/repo/header.tmpl))
70+
([source in GitHub](https://github.com/go-gitea/gitea/blob/main/templates/repo/header.tmpl))
7171

7272
### 页面的其他新增内容
7373

docs/content/doc/contributing/localization.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ menu:
2020
Gitea's localization happens through our [Crowdin project](https://crowdin.com/project/gitea).
2121

2222
For changes to an **English** translation, a pull request can be made that changes the appropriate key in
23-
the [english locale](https://github.com/go-gitea/gitea/blob/master/options/locale/locale_en-US.ini).
23+
the [english locale](https://github.com/go-gitea/gitea/blob/main/options/locale/locale_en-US.ini).
2424

2525
For changes to a **non-English** translation, refer to the Crowdin project above.
2626

docs/content/doc/contributing/localization.zh-cn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ menu:
1919

2020
Gitea的本地化是通过我们的[Crowdin项目](https://crowdin.com/project/gitea)进行的。
2121

22-
对于对**英语翻译**的更改,可以发出pull-request,来更改[英语语言环境](https://github.com/go-gitea/gitea/blob/master/options/locale/locale_en-US.ini)中合适的关键字。
22+
对于对**英语翻译**的更改,可以发出pull-request,来更改[英语语言环境](https://github.com/go-gitea/gitea/blob/main/options/locale/locale_en-US.ini)中合适的关键字。
2323

2424
有关对**非英语**翻译的更改,请参阅上面的 Crowdin 项目。
2525

docs/content/doc/contributing/localization.zh-tw.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ menu:
1919

2020
我們在 [Crowdin 專案](https://crowdin.com/project/gitea)上進行在地化工作。
2121

22-
**英語系**的翻譯,可在修改[英文語言檔](https://github.com/go-gitea/gitea/blob/master/options/locale/locale_en-US.ini)後提出合併請求。
22+
**英語系**的翻譯,可在修改[英文語言檔](https://github.com/go-gitea/gitea/blob/main/options/locale/locale_en-US.ini)後提出合併請求。
2323

2424
**非英語系**的翻譯,請前往上述的 Crowdin 專案。
2525

docs/content/doc/development/migrations.zh-tw.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ Gitea 定義了一些基本物件於套件 [modules/migration](https://github.co
3131
- 您必須實作一個 `DownloaderFactory`,它用來偵測 URL 是否符合並建立上述的 `Downloader`
3232
- 您需要在 `init()` 透過 `RegisterDownloaderFactory` 來註冊 `DownloaderFactory`
3333

34-
您可以在 [downloader.go](https://github.com/go-gitea/gitea/blob/master/modules/migration/downloader.go) 中找到這些介面。
34+
您可以在 [downloader.go](https://github.com/go-gitea/gitea/blob/main/modules/migration/downloader.go) 中找到這些介面。
3535

3636
## Uploader 介面
3737

3838
目前只有 `GiteaLocalUploader` 被實作出來,所以我們只能通過 `Uploader` 儲存已下載的資料到本地的 Gitea 實例。
3939
目前尚未支援其它 Uploader。
4040

41-
您可以在 [uploader.go](https://github.com/go-gitea/gitea/blob/master/modules/migration/uploader.go) 中找到這些介面。
41+
您可以在 [uploader.go](https://github.com/go-gitea/gitea/blob/main/modules/migration/uploader.go) 中找到這些介面。

docs/content/doc/installation/from-source.fr-fr.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ git checkout pr-xyz
5555

5656
## Compilation
5757

58-
Comme nous regroupons déjà toutes les bibliothèques requises pour compiler Gitea, vous pouvez continuer avec le processus de compilation lui-même. Nous fournissons diverses [tâches Make](https://github.com/go-gitea/gitea/blob/master/Makefile) pour rendre le processus de construction aussi simple que possible. [Voyez ici comment obtenir Make](/fr-fr/hacking-on-gitea/). Selon vos besoins, vous pourrez éventuellement ajouter diverses options de compilation, vous pouvez choisir entre ces options :
58+
Comme nous regroupons déjà toutes les bibliothèques requises pour compiler Gitea, vous pouvez continuer avec le processus de compilation lui-même. Nous fournissons diverses [tâches Make](https://github.com/go-gitea/gitea/blob/main/Makefile) pour rendre le processus de construction aussi simple que possible. [Voyez ici comment obtenir Make](/fr-fr/hacking-on-gitea/). Selon vos besoins, vous pourrez éventuellement ajouter diverses options de compilation, vous pouvez choisir entre ces options :
5959

6060
* `bindata`: Intègre toutes les ressources nécessaires à l'exécution d'une instance de Gitea, ce qui rend un déploiement facile car il n'est pas nécessaire de se préoccuper des fichiers supplémentaires.
6161
* `sqlite sqlite_unlock_notify`: Active la prise en charge d'une base de données [SQLite3](https://sqlite.org/), ceci n'est recommandé que pour les petites installations de Gitea.

0 commit comments

Comments
 (0)