Skip to content

Commit 21d25b9

Browse files
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Fix incorrect release count (go-gitea#25879) Add Github related extensions in devcontainer (go-gitea#25800) Add error info if no user can fork the repo (go-gitea#25820) Fix wrong usage of PathEscapeSegments in branch list page (go-gitea#25864) fix incorrect repo url when changed the case of ownername (go-gitea#25733) Upgrade go dependencies (go-gitea#25819) Don't stack PR tab menu on small screens (go-gitea#25789) Link to list of vulnerabilities (go-gitea#25872) [skip ci] Updated translations via Crowdin move issue filters to shared template (go-gitea#25729) [skip ci] Updated translations via Crowdin Remove `git.FileBlame` (go-gitea#25841) Fix empty project displayed in issue sidebar (go-gitea#25802) Update blog links (go-gitea#25843) Fix margin on the `new/edit milestone` page (go-gitea#25801) Do not "guess" the file encoding/BOM when using API to upload files (go-gitea#25828)
2 parents 252b54e + dc679fc commit 21d25b9

Some content is hidden

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

45 files changed

+807
-913
lines changed

.devcontainer/devcontainer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
"Vue.volar",
2424
"ms-azuretools.vscode-docker",
2525
"zixuanchen.vitest-explorer",
26-
"qwtel.sqlite-viewer"
26+
"qwtel.sqlite-viewer",
27+
"GitHub.vscode-pull-request-github"
2728
]
2829
}
2930
},

.gitpod.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ vscode:
3535
- ms-azuretools.vscode-docker
3636
- zixuanchen.vitest-explorer
3737
- qwtel.sqlite-viewer
38+
- GitHub.vscode-pull-request-github
3839

3940
ports:
4041
- name: Gitea

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -473,14 +473,14 @@ https://help.github.com/articles/signing-commits-with-gpg/
473473
## Technical Oversight Committee (TOC)
474474

475475
At the start of 2023, the `Owners` team was dissolved. Instead, the governance charter proposed a technical oversight committee (TOC) which expands the ownership team of the Gitea project from three elected positions to six positions. Three positions would be elected as it has been over the past years, and the other three would consist of appointed members from the Gitea company.
476-
https://blog.gitea.io/2023/02/gitea-quarterly-report-23q1/
476+
https://blog.gitea.com/quarterly-23q1/
477477

478478
When the new community members have been elected, the old members will give up ownership to the newly elected members. For security reasons, TOC members or any account with write access (like a bot) must use 2FA.
479479
https://help.github.com/articles/securing-your-account-with-two-factor-authentication-2fa/
480480

481481
### Current TOC members
482482

483-
- 2023-01-01 ~ 2023-12-31 - https://blog.gitea.io/2023/02/gitea-quarterly-report-23q1/
483+
- 2023-01-01 ~ 2023-12-31 - https://blog.gitea.com/quarterly-23q1/
484484
- Company
485485
- [Jason Song](https://gitea.com/wolfogre) <[email protected]>
486486
- [Lunny Xiao](https://gitea.com/lunny) <[email protected]>

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ architectures that are supported by Go, including Linux, macOS, and
6464
Windows on x86, amd64, ARM and PowerPC architectures.
6565
You can try it out using [the online demo](https://try.gitea.io/).
6666
This project has been
67-
[forked](https://blog.gitea.io/2016/12/welcome-to-gitea/) from
67+
[forked](https://blog.gitea.com/welcome-to-gitea/) from
6868
[Gogs](https://gogs.io) since November of 2016, but a lot has changed.
6969

7070
## Building

SECURITY.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ The Gitea maintainers take security seriously.
44

55
If you discover a security issue, please bring it to their attention right away!
66

7+
Previous vulnerabilities are listed at https://about.gitea.com/security.
8+
79
## Reporting a Vulnerability
810

911
Please **DO NOT** file a public issue, instead send your report privately to `[email protected]`.

assets/go-licenses.json

Lines changed: 23 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/content/doc/usage/actions/comparison.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Like `uses: https://github.com/actions/checkout@v3` or `uses: http://your_gitea.
3131
### Actions written in Go
3232

3333
Gitea Actions supports writing actions in Go.
34-
See [Creating Go Actions](https://blog.gitea.io/2023/04/creating-go-actions/).
34+
See [Creating Go Actions](https://blog.gitea.com/creating-go-actions/).
3535

3636
## Unsupported workflows syntax
3737

docs/content/doc/usage/actions/comparison.zh-cn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Gitea Actions支持通过URL绝对路径定义actions,这意味着您可以使
3131
### 使用Go编写Actions
3232

3333
Gitea Actions支持使用Go编写Actions。
34-
请参阅[创建Go Actions](https://blog.gitea.io/2023/04/creating-go-actions/)
34+
请参阅[创建Go Actions](https://blog.gitea.com/creating-go-actions/)
3535

3636
## 不支持的工作流语法
3737

docs/content/page/index.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ draft: false
1111
# What is Gitea?
1212

1313
Gitea is a painless self-hosted all-in-one software development service, it includes Git hosting, code review, team collaboration, package registry and CI/CD. It is similar to GitHub, Bitbucket and GitLab.
14-
Gitea was forked from [Gogs](http://gogs.io) originally and almost all the code has been changed. See the [Gitea Announcement](https://blog.gitea.io/2016/12/welcome-to-gitea/)
14+
Gitea was forked from [Gogs](http://gogs.io) originally and almost all the code has been changed. See the [Gitea Announcement](https://blog.gitea.com/welcome-to-gitea/)
1515
blog post to read about the justification for a fork.
1616

1717
## Purpose

docs/content/page/index.fr-fr.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ draft: false
1010

1111
# A propos de Gitea
1212

13-
Gitea est un service Git auto-hébergé très simple à installer et à utiliser. Il est similaire à GitHub, Bitbucket ou Gitlab. Le développement initial provient sur [Gogs] (http://gogs.io), mais nous l'avons forké puis renommé Gitea. Si vous souhaitez en savoir plus sur les raisons pour lesquelles nous avons fait cela, lisez [cette publication] (https://blog.gitea.io/2016/12/welcome-to-gitea/) sur le blog.
13+
Gitea est un service Git auto-hébergé très simple à installer et à utiliser. Il est similaire à GitHub, Bitbucket ou Gitlab. Le développement initial provient sur [Gogs] (http://gogs.io), mais nous l'avons forké puis renommé Gitea. Si vous souhaitez en savoir plus sur les raisons pour lesquelles nous avons fait cela, lisez [cette publication] (https://blog.gitea.com/welcome-to-gitea/) sur le blog.
1414

1515
## Objectif
1616

docs/content/page/index.zh-cn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ draft: false
1010

1111
# 关于Gitea
1212

13-
Gitea 是一个自己托管的Git服务程序。他和GitHub, Bitbucket or Gitlab等比较类似。他是从 [Gogs](http://gogs.io) 发展而来,不过我们已经Fork并且命名为Gitea。对于我们Fork的原因可以看 [这里](https://blog.gitea.io/2016/12/welcome-to-gitea/)
13+
Gitea 是一个自己托管的Git服务程序。他和GitHub, Bitbucket or Gitlab等比较类似。他是从 [Gogs](http://gogs.io) 发展而来,不过我们已经Fork并且命名为Gitea。对于我们Fork的原因可以看 [这里](https://blog.gitea.com/welcome-to-gitea/)
1414

1515
## 目标
1616

docs/content/page/index.zh-tw.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ draft: false
1111
# 關於 Gitea
1212

1313
Gitea 是一個可自行託管的 Git 服務。你可以拿 GitHub、Bitbucket 或 Gitlab 來比較看看。
14-
Gitea 是從 [Gogs](http://gogs.io) Fork 出來的,請閱讀部落格文章 [Gitea 公告](https://blog.gitea.io/2016/12/welcome-to-gitea/)以了解我們 Fork 的理由。
14+
Gitea 是從 [Gogs](http://gogs.io) Fork 出來的,請閱讀部落格文章 [Gitea 公告](https://blog.gitea.com/welcome-to-gitea/)以了解我們 Fork 的理由。
1515

1616
## 目標
1717

0 commit comments

Comments
 (0)