Merge branch 'main' into refactor-easymde

Author: wxiaoguang

CHANGELOG.md

@@ -4,6 +4,24 @@ This changelog goes through all the changes that have been made in each release
 without substantial changes to our git log; to see the highlights of what has
 been added to each release, please refer to the [blog](https://blog.gitea.io).
 
+## [1.15.9](https://github.com/go-gitea/gitea/releases/tag/v1.15.9) - 2021-12-30
+
+* BUGFIXES
+  * Fix wrong redirect on org labels (#18128) (#18134)
+  * Fix: unstable sort skips/duplicates issues across pages (#18094) (#18095)
+  * Revert "Fix delete u2f keys bug (#18042)" (#18107)
+  * Migrating wiki don't require token, so we should move it out of the require form (#17645) (#18104)
+  * Prevent NPE if gitea uploader fails to open url (#18080) (#18101)
+  * Reset locale on login (#17734) (#18100)
+  * Correctly handle failed migrations (#17575) (#18099)
+  * Instead of using routerCtx just escape the url before routing (#18086) (#18098)
+  * Quote references to the user table in consistency checks (#18072) (#18073)
+  * Add NotFound handler (#18062) (#18067)
+  * Ensure that git repository is closed before transfer (#18049) (#18057)
+  * Use common sessioner for API and web routes (#18114)
+* TRANSLATION
+  * Fix code search result hint on zh-CN (#18053)
+
 ## [1.15.8](https://github.com/go-gitea/gitea/releases/tag/v1.15.8) - 2021-12-20
 
 * BUGFIXES

docs/config.yaml

@@ -18,7 +18,7 @@ params:
   description: Git with a cup of tea
   author: The Gitea Authors
   website: https://docs.gitea.io
-  version: 1.15.8
+  version: 1.15.9
   minGoVersion: 1.16
   goVersion: 1.17
   minNodeVersion: 12.17

docs/content/doc/developers/hacking-on-gitea.en-us.md

@@ -73,6 +73,7 @@ One of these three distributions of Make will run on Windows:
   - MSYS2 is a collection of tools and libraries providing you with an easy-to-use environment for building, installing and running native Windows software, it includes MinGW-w64. 
   - In MingGW-w64, the binary is called `mingw32-make.exe` instead of `make.exe`. Add the `bin` folder to `PATH`.
   - In MSYS2, you can use `make` directly. See [MSYS2 Porting](https://www.msys2.org/wiki/Porting/).
+  - To compile Gitea with CGO_ENABLED (eg: SQLite3), you might need to use [tdm-gcc](https://jmeubank.github.io/tdm-gcc/) instead of MSYS2 gcc, because MSYS2 gcc headers lack some Windows-only CRT functions like `_beginthread`.
 - [Chocolatey package](https://chocolatey.org/packages/make). Run `choco install make`
 
 **Note**: If you are attempting to build using make with Windows Command Prompt, you may run into issues. The above prompts (Git bash, or MinGW) are recommended, however if you only have command prompt (or potentially PowerShell) you can set environment variables using the [set](https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/set_1) command, e.g. `set TAGS=bindata`.
@@ -273,10 +274,17 @@ make test-sqlite-migration # with SQLite switched for the appropriate database
 
 There are two types of test run by Gitea: Unit tests and Integration Tests.
 
+### Unit Tests
+
+Unit tests are covered by `*_test.go` in `go test` system.
+You can set environment variable `GITEA_UNIT_TESTS_VERBOSE=1` to see detail logs during the test.
+
 ```bash
 TAGS="bindata sqlite sqlite_unlock_notify" make test # Runs the unit tests
 ```
 
+### Integration Tests
+
 Unit tests will not and cannot completely test Gitea alone. Therefore, we
 have written integration tests; however, these are database dependent.
 
@@ -288,10 +296,12 @@ will run the integration tests in an SQLite environment. Integration tests
 require `git lfs` to be installed. Other database tests are available but
 may need adjustment to the local environment.
 
-Look at
-[`integrations/README.md`](https://github.com/go-gitea/gitea/blob/main/integrations/README.md)
+Take a look at [`integrations/README.md`](https://github.com/go-gitea/gitea/blob/main/integrations/README.md)
 for more information and how to run a single test.
 
+
+### Testing for a PR
+
 Our continuous integration will test the code passes its unit tests and that
 all supported databases will pass integration test in a Docker environment.
 Migration from several recent versions of Gitea will also be tested.

docs/content/doc/installation/from-package.zh-cn.md

@@ -1,37 +1,108 @@
 ---
 date: "2016-12-01T16:00:00+02:00"
-title: "选择包安装"
+title: "使用包管理器安装"
 slug: "install-from-package"
 weight: 10
 toc: false
 draft: false
 menu:
   sidebar:
     parent: "installation"
-    name: "选择包安装"
+    name: "使用包管理器安装"
     weight: 20
     identifier: "install-from-package"
 ---
 
-# 使用包安装
+# 使用包管理器安装
 
-## Linux
+**目录**
 
-目前还没有对应的Linux安装包发布，如果我们发布了，我们将更新本页面。当前你可以查看 [从二进制安装]({{< relref "from-binary.zh-cn.md" >}})。
+{{< toc >}}
+
+## Alpine Linux
+
+Gitea 已经包含在 Alpine Linux 的[社区存储库](https://pkgs.alpinelinux.org/packages?name=gitea&branch=edge)中，版本与 Gitea 官方保持同步。
+
+```sh
+apk add gitea
+```
+
+## Arch Linux
+
+Gitea 已经在滚动发布发行版的官方[社区存储库](https://www.archlinux.org/packages/community/x86_64/gitea/)中，版本与 Gitea 官方保持同步。
+
+```sh
+pacman -S gitea
+```
+
+## Arch Linux ARM
+
+官方支持 [aarch64](https://archlinuxarm.org/packages/aarch64/gitea)， [armv7h](https://archlinuxarm.org/packages/armv7h/gitea) 和 [armv6h](https://archlinuxarm.org/packages/armv6h/gitea) 架构。
+
+```sh
+pacman -S gitea
+```
+
+## Canonical Snap
+
+目前 Gitea 已在 Snap Store 中发布，名称为 [gitea](https://snapcraft.io/gitea)。
+
+```sh
+snap install gitea
+```
+
+## SUSE/openSUSE
+
+OpenSUSE 构建服务为 [openSUSE 和 SLE](https://software.opensuse.org/download/package?package=gitea&project=devel%3Atools%3Ascm)
+提供包，你可以在开发软件配置管理存储库中找到它们。
 
 ## Windows
 
-目前还没有对应的Windows安装包发布，如果我们发布了，我们将更新本页面。我们计划使用 `MSI` 安装器或者 [Chocolatey](https://chocolatey.org/)来制作安装包。当前你可以查看 [从二进制安装]({{< relref "from-binary.zh-cn.md" >}})。
+目前你可以通过 [Chocolatey](https://chocolatey.org/) 来安装 [Gitea](https://chocolatey.org/packages/gitea)。
+
+```sh
+choco install gitea
+```
+
+你也可以 [从二进制安装]({{< relref "from-binary.zh-cn.md" >}}) 。
 
 ## macOS
 
-macOS 平台下当前我们仅支持通过 `brew` 来安装。如果您没有安装 [Homebrew](http://brew.sh/)，你也可以查看 [从二进制安装]({{< relref "from-binary.zh-cn.md" >}})。在你安装了 `brew` 之后， 你可以执行以下命令：
+macOS 平台下当前我们仅支持通过 `brew` 来安装。如果你没有安装 [Homebrew](http://brew.sh/)，你也可以查看 [从二进制安装]({{< relref "from-binary.zh-cn.md" >}})。在你安装了 `brew` 之后， 你可以执行以下命令：
 
 ```
 brew tap go-gitea/gitea
 brew install gitea
 ```
 
+## FreeBSD
+
+可以使用 Gitea 的 FreeBSD port `www/gitea`。 请安装预构建的二进制包：
+
+```
+pkg install gitea
+```
+
+对于最新版本，或使用自定义选项构建 port，请
+[从 port 安装](https://www.freebsd.org/doc/handbook/ports-using.html)：
+
+```
+su -
+cd /usr/ports/www/gitea
+make install clean
+```
+
+该 port 使用标准的 FreeBSD 文件系统布局：配置文件在 `/usr/local/etc/gitea` 目录中，
+模板、选项、插件和主题在 `/usr/local/share/gitea` 目录中，启动脚本在 `/usr/local/etc/rc.d/gitea` 目录中。
+
+要使 Gitea 作为服务运行，请运行 `sysrc gitea_enable=YES` 并使用 `service gitea start` 命令启动它。
+
+## 第三方
+
+如果这里没有找到你喜欢的包管理器，可以使用 Gitea 第三方软件包。这里有一个完整的列表： [awesome-gitea](https://gitea.com/gitea/awesome-gitea/src/branch/master/README.md#user-content-packages)。
+
+如果你知道其他 Gitea 第三方软件包，请发送 PR 来添加它。
+
 ## 需要帮助?
 
 如果从本页中没有找到你需要的内容，请访问 [帮助页面]({{< relref "seek-help.zh-cn.md" >}})

models/repo.go

@@ -294,33 +294,39 @@ func CanUserForkRepo(user *user_model.User, repo *repo_model.Repository) (bool,
 	return false, nil
 }
 
+// FindUserOrgForks returns the forked repositories for one user from a repository
+func FindUserOrgForks(repoID, userID int64) ([]*repo_model.Repository, error) {
+	var cond builder.Cond = builder.And(
+		builder.Eq{"fork_id": repoID},
+		builder.In("owner_id",
+			builder.Select("org_id").
+				From("org_user").
+				Where(builder.Eq{"uid": userID}),
+		),
+	)
+
+	var repos []*repo_model.Repository
+	return repos, db.GetEngine(db.DefaultContext).Table("repository").Where(cond).Find(&repos)
+}
+
 // GetForksByUserAndOrgs return forked repos of the user and owned orgs
 func GetForksByUserAndOrgs(user *user_model.User, repo *repo_model.Repository) ([]*repo_model.Repository, error) {
 	var repoList []*repo_model.Repository
 	if user == nil {
 		return repoList, nil
 	}
-	var forkedRepo *repo_model.Repository
 	forkedRepo, err := repo_model.GetUserFork(repo.ID, user.ID)
 	if err != nil {
 		return repoList, err
 	}
 	if forkedRepo != nil {
 		repoList = append(repoList, forkedRepo)
 	}
-	canCreateRepos, err := GetOrgsCanCreateRepoByUserID(user.ID)
+	orgForks, err := FindUserOrgForks(repo.ID, user.ID)
 	if err != nil {
-		return repoList, err
-	}
-	for _, org := range canCreateRepos {
-		forkedRepo, err := repo_model.GetUserFork(repo.ID, org.ID)
-		if err != nil {
-			return repoList, err
-		}
-		if forkedRepo != nil {
-			repoList = append(repoList, forkedRepo)
-		}
+		return nil, err
 	}
+	repoList = append(repoList, orgForks...)
 	return repoList, nil
 }
 

options/locale/locale_cs-CZ.ini

@@ -99,10 +99,7 @@ error404=Stránka, kterou se snažíte zobrazit, buď <strong>neexistuje</strong
 never=Nikdy
 
 [error]
-occurred=Nastala chyba
-report_message=Pokud jste si jisti, že se jedná o chybu Gitea, prosím vyhledejte problém na <a href="https://github.com/go-gitea/gitea/issues">GitHub</a> a v případě potřeby otevřete nový problém.
 missing_csrf=Špatný požadavek: Neexistuje CSRF token
-invalid_csrf=Špatný požadavek: Neplatný CSRF token
 
 [startpage]
 app_desc=Snadno přístupný vlastní Git

options/locale/locale_de-DE.ini

@@ -104,10 +104,7 @@ error404=Die Seite, die du gerade versuchst aufzurufen, <strong>existiert entwed
 never=Niemals
 
 [error]
-occurred=Ein Fehler ist aufgetreten
-report_message=Wenn du dir sicher bist, dass dies ein Gitea-Fehler ist, suche bitte auf <a href="https://github.com/go-gitea/gitea/issues">GitHub</a> nach diesem Fehler und erstelle gegebenenfalls einen neuen Bugreport.
 missing_csrf=Fehlerhafte Anfrage: Kein CSRF Token verfügbar
-invalid_csrf=Fehlerhafte Anfrage: Ungültiger CSRF Token
 
 [startpage]
 app_desc=Ein einfacher, selbst gehosteter Git-Service

options/locale/locale_el-GR.ini

@@ -104,10 +104,7 @@ error404=Η σελίδα που προσπαθείτε να φτάσετε εί
 never=Ποτέ
 
 [error]
-occurred=Παρουσιάστηκε ένα σφάλμα
-report_message=Αν είστε σίγουροι ότι πρόκειται για σφάλμα Gitea, παρακαλούμε αναζητήστε το ζήτημα στο <a href="https://github.com/go-gitea/gitea/issues">GitHub</a> και ανοίξτε νέο ζήτημα εάν είναι απαραίτητο.
 missing_csrf=Bad Request: δεν υπάρχει διακριτικό CSRF
-invalid_csrf=Bad Request: Άκυρο διακριτικό CSRF
 
 [startpage]
 app_desc=Μια ανώδυνη, αυτο-φιλοξενούμενη υπηρεσία Git

options/locale/locale_es-ES.ini

@@ -104,10 +104,7 @@ error404=La página a la que está intentando acceder o <strong>no existe</stron
 never=Nunca
 
 [error]
-occurred=Se ha producido un error
-report_message=Si estás seguro de que este es un error de Gitea, por favor busca un problema en <a href="https://github.com/go-gitea/gitea/issues">GitHub</a> y abre un nuevo problema si es necesario.
 missing_csrf=Solicitud incorrecta: sin token CSRF
-invalid_csrf=Solicitud incorrecta: el token CSRF no es válido
 
 [startpage]
 app_desc=Un servicio de Git autoalojado y sin complicaciones

options/locale/locale_fa-IR.ini

@@ -90,8 +90,6 @@ error404=صفحه موردنظر شما یا <strong>وجود ندارد</strong
 
 
 [error]
-occurred=خطایی رخ داده است
-report_message=اگر شما مطمئن هستیند این مشکل مربوط به یک باگ در Gitea است، لطفا در <a href="https://github.com/go-gitea/gitea/issues">GitHub</a> مشکل را جستجو کنید و در صورت نیاز، یک موضوع جدید باز کنید.
 
 [startpage]
 app_desc=یک سرویس گیت بی‌درد سر و راحت

options/locale/locale_fi-FI.ini

@@ -86,7 +86,6 @@ error404=Sivu, jota yrität nähdä, joko <strong>ei löydy</strong> tai <strong
 
 
 [error]
-occurred=Tapahtui virhe
 
 [startpage]
 app_desc=Kivuton, itsehostattu Git-palvelu

options/locale/locale_fr-FR.ini

@@ -99,10 +99,7 @@ error404=La page que vous essayez d'atteindre <strong>n'existe pas</strong> ou <
 never=Jamais
 
 [error]
-occurred=Une erreur est survenue
-report_message=Si vous êtes sûr qu'il s'agit d'un bug de Gitea, cherchez s’il existe un ticket sur <a href="https://github.com/go-gitea/gitea/issues">GitHub</a> et ouvrez-en un nouveau si nécessaire.
 missing_csrf=Requête incorrecte: aucun jeton CSRF présent
-invalid_csrf=Requête incorrecte: jeton CSRF invalide
 
 [startpage]
 app_desc=Un service Git auto-hébergé sans prise de tête

options/locale/locale_hu-HU.ini

@@ -93,8 +93,6 @@ error404=Az elérni kívánt oldal vagy <strong>nem létezik</strong>, vagy <str
 
 
 [error]
-occurred=Probléma lépett fel
-report_message=Ha biztos benne, hogy ez egy Gitea hiba, keressen a problémára a <a href="https://github.com/go-gitea/gitea/issues">GitHub-on</a> és hozzon létre új hibajelentést, ha szükséges.
 
 [startpage]
 app_desc=Fájdalommentes, saját gépre telepíthető Git szolgáltatás

options/locale/locale_it-IT.ini

@@ -96,8 +96,6 @@ error404=La pagina che stai cercando di raggiungere <strong>non esiste</strong>
 
 
 [error]
-occurred=Si è verificato un errore
-report_message=Se sei sicuro che sia un bug di Gitea, cerca il problema su <a href="https://github.com/go-gitea/gitea/issues">GitHub</a> e apri una nuova segnalazione se necessario.
 
 [startpage]
 app_desc=Un servizio auto-ospitato per Git pronto all'uso