Merge branch 'main' into fix/delete-action

Author: jolheiser

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 $@

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

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

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

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

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

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

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

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

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

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

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

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).
 

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).

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`。 请安装预构建的二进制包：

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

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

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

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

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

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

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

docs/content/doc/usage/push-options.en-us.md

@@ -1,6 +1,6 @@
 ---
 date: "2020-07-06T16:00:00+02:00"
-title: "Usage: Push Options"
+title: "Push Options"
 slug: "push-options"
 weight: 15
 toc: false

docs/content/doc/usage/push-options.zh-tw.md

@@ -1,6 +1,6 @@
 ---
 date: "2020-07-06T16:00:00+02:00"
-title: "使用: Push Options"
+title: "Push Options"
 slug: "push-options"
 weight: 15
 toc: false

docs/content/doc/usage/push-to-create.en-us.md

@@ -1,6 +1,6 @@
 ---
 date: "2020-07-06T16:00:00+02:00"
-title: "Usage: Push To Create"
+title: "Push To Create"
 slug: "push-to-create"
 weight: 15
 toc: false

models/actions/run.go

@@ -36,7 +36,7 @@ type ActionRun struct {
 	TriggerUser       *user_model.User       `xorm:"-"`
 	Ref               string
 	CommitSHA         string
-	IsForkPullRequest bool
+	IsForkPullRequest bool  // If this is triggered by a PR from a forked repository or an untrusted user, we need to check if it is approved and limit permissions when running the workflow.
 	NeedApproval      bool  // may need approval if it's a fork pull request
 	ApprovedBy        int64 `xorm:"index"` // who approved
 	Event             webhook_module.HookEventType

models/fixtures/org_user.yml

@@ -75,3 +75,9 @@
   uid: 31
   org_id: 19
   is_public: true
+
+-
+  id: 14
+  uid: 5
+  org_id: 23
+  is_public: false

models/fixtures/team.yml

@@ -172,4 +172,15 @@
   num_repos: 0
   num_members: 0
   includes_all_repositories: false
-  can_create_org_repo: true
+  can_create_org_repo: true
+
+-
+  id: 17
+  org_id: 23
+  lower_name: team14writeauth
+  name: team14WriteAuth
+  authorize: 2 # write
+  num_repos: 0
+  num_members: 1
+  includes_all_repositories: false
+  can_create_org_repo: true

models/fixtures/team_unit.yml

@@ -268,3 +268,9 @@
   team_id: 9
   type: 1 # code
   access_mode: 1
+
+-
+  id: 46
+  team_id: 17
+  type: 9 # package
+  access_mode: 0

models/fixtures/team_user.yml

@@ -99,3 +99,9 @@
   org_id: 3
   team_id: 14
   uid: 2
+
+-
+  id: 18
+  org_id: 23
+  team_id: 17
+  uid: 5

models/fixtures/user.yml

@@ -844,8 +844,8 @@
   num_following: 0
   num_stars: 0
   num_repos: 2
-  num_teams: 1
-  num_members: 0
+  num_teams: 2
+  num_members: 1
   visibility: 2
   repo_admin_change_team_access: false
   theme: ""

models/organization/org_test.go

@@ -212,25 +212,31 @@ func TestGetOrgUsersByUserID(t *testing.T) {
 
 	orgUsers, err := organization.GetOrgUsersByUserID(5, &organization.SearchOrganizationsOptions{All: true})
 	assert.NoError(t, err)
-	if assert.Len(t, orgUsers, 2) {
+	if assert.Len(t, orgUsers, 3) {
 		assert.Equal(t, organization.OrgUser{
 			ID:       orgUsers[0].ID,
-			OrgID:    6,
+			OrgID:    23,
 			UID:      5,
-			IsPublic: true,
+			IsPublic: false,
 		}, *orgUsers[0])
 		assert.Equal(t, organization.OrgUser{
 			ID:       orgUsers[1].ID,
+			OrgID:    6,
+			UID:      5,
+			IsPublic: true,
+		}, *orgUsers[1])
+		assert.Equal(t, organization.OrgUser{
+			ID:       orgUsers[2].ID,
 			OrgID:    7,
 			UID:      5,
 			IsPublic: false,
-		}, *orgUsers[1])
+		}, *orgUsers[2])
 	}
 
 	publicOrgUsers, err := organization.GetOrgUsersByUserID(5, &organization.SearchOrganizationsOptions{All: false})
 	assert.NoError(t, err)
 	assert.Len(t, publicOrgUsers, 1)
-	assert.Equal(t, *orgUsers[0], *publicOrgUsers[0])
+	assert.Equal(t, *orgUsers[1], *publicOrgUsers[0])
 
 	orgUsers, err = organization.GetOrgUsersByUserID(1, &organization.SearchOrganizationsOptions{All: true})
 	assert.NoError(t, err)