Merge branch 'main' into bugfix/issue-23809

go-gitea · Apr 7, 2023 · ac9c64e · ac9c64e
2 parents af11b19 + 950c93a
commit ac9c64e
Show file tree

Hide file tree

Showing 67 changed files with 683 additions and 344 deletions.
diff --git a/Makefile b/Makefile
@@ -747,7 +747,7 @@ generate-go: $(TAGS_PREREQ)
 
 .PHONY: security-check
 security-check:
-	go run $(GOVULNCHECK_PACKAGE) -v ./...
+	go run $(GOVULNCHECK_PACKAGE) ./...
 
 $(EXECUTABLE): $(GO_SOURCES) $(TAGS_PREREQ)
 	CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@

diff --git a/docs/content/doc/administration/backup-and-restore.en-us.md b/docs/content/doc/administration/backup-and-restore.en-us.md
@@ -1,6 +1,6 @@
 ---
 date: "2017-01-01T16:00:00+02:00"
-title: "Usage: Backup and Restore"
+title: "Backup and Restore"
 slug: "backup-and-restore"
 weight: 11
 toc: false

diff --git a/docs/content/doc/administration/command-line.en-us.md b/docs/content/doc/administration/command-line.en-us.md
@@ -1,6 +1,6 @@
 ---
 date: "2017-01-01T16:00:00+02:00"
-title: "Usage: Command Line"
+title: "Gitea Command Line"
 slug: "command-line"
 weight: 1
 toc: false

diff --git a/docs/content/doc/administration/email-setup.en-us.md b/docs/content/doc/administration/email-setup.en-us.md
@@ -1,6 +1,6 @@
 ---
 date: "2019-10-15T10:10:00+05:00"
-title: "Usage: Email setup"
+title: "Email setup"
 slug: "email-setup"
 weight: 12
 toc: false

diff --git a/docs/content/doc/administration/fail2ban-setup.en-us.md b/docs/content/doc/administration/fail2ban-setup.en-us.md
@@ -1,6 +1,6 @@
 ---
 date: "2018-05-11T11:00:00+02:00"
-title: "Usage: Setup fail2ban"
+title: "Fail2ban Setup "
 slug: "fail2ban-setup"
 weight: 16
 toc: false

diff --git a/docs/content/doc/administration/fail2ban-setup.zh-cn.md b/docs/content/doc/administration/fail2ban-setup.zh-cn.md
@@ -1,6 +1,6 @@
 ---
 date: "2022-08-01T00:00:00+00:00"
-title: "使用: 设置 Fail2ban"
+title: "设置 Fail2ban"
 slug: "fail2ban-setup"
 weight: 16
 toc: false

diff --git a/docs/content/doc/administration/git-lfs-support.en-us.md b/docs/content/doc/administration/git-lfs-support.en-us.md
@@ -1,6 +1,6 @@
 ---
 date: "2019-10-06T08:00:00+05:00"
-title: "Usage: Git LFS setup"
+title: "Git LFS setup"
 slug: "git-lfs-setup"
 weight: 12
 toc: false

diff --git a/docs/content/doc/administration/https-support.en-us.md b/docs/content/doc/administration/https-support.en-us.md
@@ -1,6 +1,6 @@
 ---
 date: "2018-06-02T11:00:00+02:00"
-title: "Usage: HTTPS setup"
+title: "HTTPS setup"
 slug: "https-setup"
 weight: 12
 toc: false

diff --git a/docs/content/doc/administration/logging-documentation.en-us.md b/docs/content/doc/administration/logging-documentation.en-us.md
@@ -1,6 +1,6 @@
 ---
 date: "2019-04-02T17:06:00+01:00"
-title: "Advanced: Logging Configuration"
+title: "Logging Configuration"
 slug: "logging-configuration"
 weight: 40
 toc: false

diff --git a/docs/content/doc/administration/reverse-proxies.en-us.md b/docs/content/doc/administration/reverse-proxies.en-us.md
@@ -1,6 +1,6 @@
 ---
 date: "2018-05-22T11:00:00+00:00"
-title: "Usage: Reverse Proxies"
+title: "Reverse Proxies"
 slug: "reverse-proxies"
 weight: 16
 toc: false

diff --git a/docs/content/doc/administration/search-engines-indexation.en-us.md b/docs/content/doc/administration/search-engines-indexation.en-us.md
@@ -1,6 +1,6 @@
 ---
 date: "2019-12-31T13:55:00+05:00"
-title: "Advanced: Search Engines Indexation"
+title: "Search Engines Indexation"
 slug: "search-engines-indexation"
 weight: 60
 toc: false

diff --git a/docs/content/doc/installation/comparison.en-us.md b/docs/content/doc/installation/comparison.en-us.md
@@ -1,6 +1,6 @@
 ---
 date: "2018-05-07T13:00:00+02:00"
-title: "Gitea compared to other Git hosting options"
+title: "Compared to other Git hosting"
 slug: "comparison"
 weight: 5
 toc: false

diff --git a/docs/content/doc/installation/database-preparation.en-us.md b/docs/content/doc/installation/database-preparation.en-us.md
@@ -15,7 +15,7 @@ menu:
 
 # Database Preparation
 
-You need a database to use Gitea. Gitea supports PostgreSQL (>=10), MySQL (>=5.7), SQLite, and MSSQL (>=2008R2 SP3). This page will guide into preparing database. Only PostgreSQL and MySQL will be covered here since those database engines are widely-used in production.
+You need a database to use Gitea. Gitea supports PostgreSQL (>=10), MySQL (>=5.7), SQLite, and MSSQL (>=2008R2 SP3). This page will guide into preparing database. Only PostgreSQL and MySQL will be covered here since those database engines are widely-used in production. If you plan to use SQLite, you can ignore this chapter.
 
 Database instance can be on same machine as Gitea (local database setup), or on different machine (remote database).
 

diff --git a/docs/content/doc/installation/from-package.en-us.md b/docs/content/doc/installation/from-package.en-us.md
@@ -13,12 +13,25 @@ menu:
     identifier: "install-from-package"
 ---
 
-# Installation from package
-
 **Table of Contents**
 
 {{< toc >}}
 
+# Official packages
+
+## macOS
+
+Currently, the only supported method of installation on MacOS is [Homebrew](http://brew.sh/).
+Following the [deployment from binary]({{< relref "from-binary.en-us.md" >}}) guide may work,
+but is not supported. To install Gitea via `brew`:
+
+```
+brew tap gitea/tap https://gitea.com/gitea/homebrew-gitea
+brew install gitea
+```
+
+# Unofficial packages
+
 ## Alpine Linux
 
 Alpine Linux has [Gitea](https://pkgs.alpinelinux.org/packages?name=gitea&branch=edge) in its community repository which follows the latest stable version.
@@ -74,17 +87,6 @@ choco install gitea
 
 Or follow the [deployment from binary]({{< relref "from-binary.en-us.md" >}}) guide.
 
-## macOS
-
-Currently, the only supported method of installation on MacOS is [Homebrew](http://brew.sh/).
-Following the [deployment from binary]({{< relref "from-binary.en-us.md" >}}) guide may work,
-but is not supported. To install Gitea via `brew`:
-
-```
-brew tap gitea/tap https://gitea.com/gitea/homebrew-gitea
-brew install gitea
-```
-
 ## FreeBSD
 
 A FreeBSD port `www/gitea` is available. To install the pre-built binary package:
@@ -108,7 +110,7 @@ is in `/usr/local/etc/rc.d/gitea`.
 
 To enable Gitea to run as a service, run `sysrc gitea_enable=YES` and start it with `service gitea start`.
 
-## Third-party
+## Others
 
 Various other third-party packages of Gitea exist.
 To see a curated list, head over to [awesome-gitea](https://gitea.com/gitea/awesome-gitea/src/branch/master/README.md#user-content-packages).

diff --git a/docs/content/doc/installation/from-package.zh-cn.md b/docs/content/doc/installation/from-package.zh-cn.md
@@ -13,12 +13,23 @@ menu:
     identifier: "install-from-package"
 ---
 
-# 使用包管理器安装
-
 **目录**
 
 {{< toc >}}
 
+# 官方包管理器
+
+## macOS
+
+macOS 平台下当前我们仅支持通过 `brew` 来安装。如果你没有安装 [Homebrew](http://brew.sh/)，你也可以查看 [从二进制安装]({{< relref "from-binary.zh-cn.md" >}})。在你安装了 `brew` 之后， 你可以执行以下命令：
+
+```
+brew tap gitea/tap https://gitea.com/gitea/homebrew-gitea
+brew install gitea
+```
+
+# 非官方包管理器
+
 ## Alpine Linux
 
 Gitea 已经包含在 Alpine Linux 的[社区存储库](https://pkgs.alpinelinux.org/packages?name=gitea&branch=edge)中，版本与 Gitea 官方保持同步。
@@ -66,15 +77,6 @@ choco install gitea
 
 你也可以 [从二进制安装]({{< relref "from-binary.zh-cn.md" >}}) 。
 
-## macOS
-
-macOS 平台下当前我们仅支持通过 `brew` 来安装。如果你没有安装 [Homebrew](http://brew.sh/)，你也可以查看 [从二进制安装]({{< relref "from-binary.zh-cn.md" >}})。在你安装了 `brew` 之后， 你可以执行以下命令：
-
-```
-brew tap gitea/tap https://gitea.com/gitea/homebrew-gitea
-brew install gitea
-```
-
 ## FreeBSD
 
 可以使用 Gitea 的 FreeBSD port `www/gitea`。 请安装预构建的二进制包：

diff --git a/docs/content/doc/usage/agit-support.en-us.md b/docs/content/doc/usage/agit-support.en-us.md
@@ -1,6 +1,6 @@
 ---
 date: "	2022-09-01T20:50:42+0000"
-title: "Usage: Agit Setup"
+title: "Agit Setup"
 slug: "agit-setup"
 weight: 12
 toc: false

diff --git a/docs/content/doc/usage/issue-pull-request-templates.en-us.md b/docs/content/doc/usage/issue-pull-request-templates.en-us.md
@@ -1,6 +1,6 @@
 ---
 date: "2018-05-10T16:00:00+02:00"
-title: "Usage: Issue and Pull Request templates"
+title: "Issue and Pull Request templates"
 slug: "issue-pull-request-templates"
 weight: 15
 toc: false

diff --git a/docs/content/doc/usage/labels.en-us.md b/docs/content/doc/usage/labels.en-us.md
@@ -1,6 +1,6 @@
 ---
 date: "2023-03-04T19:00:00+00:00"
-title: "Usage: Labels"
+title: "Labels"
 slug: "labels"
 weight: 13
 toc: false

diff --git a/docs/content/doc/usage/linked-references.en-us.md b/docs/content/doc/usage/linked-references.en-us.md
@@ -1,6 +1,6 @@
 ---
 date: "2019-11-21T17:00:00-03:00"
-title: "Usage: Automatically Linked References"
+title: "Automatically Linked References"
 slug: "automatically-linked-references"
 weight: 15
 toc: false

diff --git a/docs/content/doc/usage/merge-message-templates.en-us.md b/docs/content/doc/usage/merge-message-templates.en-us.md
@@ -1,6 +1,6 @@
 ---
 date: "2022-08-31T17:35:40+08:00"
-title: "Usage: Merge Message templates"
+title: "Merge Message templates"
 slug: "merge-message-templates"
 weight: 15
 toc: false

diff --git a/docs/content/doc/usage/pull-request.en-us.md b/docs/content/doc/usage/pull-request.en-us.md
@@ -1,6 +1,6 @@
 ---
 date: "2018-06-01T19:00:00+02:00"
-title: "Usage: Pull Request"
+title: "Pull Request"
 slug: "pull-request"
 weight: 13
 toc: false

diff --git a/docs/content/doc/usage/pull-request.zh-tw.md b/docs/content/doc/usage/pull-request.zh-tw.md
@@ -1,6 +1,6 @@
 ---
 date: "2018-06-01T19:00:00+02:00"
-title: "使用: 合併請求"
+title: "合併請求"
 slug: "pull-request"
 weight: 13
 toc: false

diff --git a/docs/content/doc/usage/push-options.en-us.md b/docs/content/doc/usage/push-options.en-us.md
diff --git a/docs/content/doc/usage/push-options.zh-tw.md b/docs/content/doc/usage/push-options.zh-tw.md
diff --git a/...content/doc/usage/push-to-create.en-us.md → docs/content/doc/usage/push.en-us.md b/...content/doc/usage/push-to-create.en-us.md → docs/content/doc/usage/push.en-us.md
@@ -1,18 +1,51 @@
 ---
 date: "2020-07-06T16:00:00+02:00"
-title: "Usage: Push To Create"
-slug: "push-to-create"
+title: "Usage: Push"
+slug: "push"
 weight: 15
 toc: false
 draft: false
 menu:
   sidebar:
     parent: "usage"
-    name: "Push To Create"
+    name: "Push"
     weight: 15
-    identifier: "push-to-create"
+    identifier: "push"
 ---
 
+**Table of Contents**
+
+{{< toc >}}
+
+There are some additional features when pushing commits to Gitea server.
+
+# Open PR through Push
+
+When you push commits to a non-default branch for the first time,
+you will receive a link you can click on to visit the compare page of your branch compared to your main branch.
+From there, it's easy to create a pull request, even if you want to target another branch.
+
+![Gitea Push Hint](/gitea-push-hint.png)
+
+# Push Options
+
+In Gitea `1.13`, support for some [push options](https://git-scm.com/docs/git-push#Documentation/git-push.txt--oltoptiongt)
+were added.
+
+## Supported Options
+
+- `repo.private` (true|false) - Change the repository's visibility.
+
+  This is particularly useful when combined with push-to-create.
+
+- `repo.template` (true|false) - Change whether the repository is a template.
+
+Example of changing a repository's visibility to public:
+
+```shell
+git push -o repo.private=false -u origin main
+```
+
 # Push To Create
 
 Push to create is a feature that allows you to push to a repository that does not exist yet in Gitea. This is useful for automation and for allowing users to create repositories without having to go through the web interface. This feature is disabled by default.
@@ -35,6 +68,4 @@ git push -u origin main
 
 This assumes you are using an SSH remote, but you can also use HTTPS remotes as well.
 
-## Push options (bonus)
-
-Push-to-create will default to the visibility defined by `DEFAULT_PUSH_CREATE_PRIVATE` in `app.ini`. To explicitly set the visibility, you can use a [push option]({{< relref "doc/usage/push-options.en-us.md" >}}).
+Push-to-create will default to the visibility defined by `DEFAULT_PUSH_CREATE_PRIVATE` in `app.ini`.