Merge branch 'main' into improve-push-memory

wxiaoguang · web-flow · commit 97a381827012 · 2021-11-23T11:01:05.000+08:00
diff --git a/docs/content/doc/developers.zh-cn.md b/docs/content/doc/developers.zh-cn.md
@@ -0,0 +1,13 @@
+---
+date: "2016-12-01T16:00:00+02:00"
+title: "开发者"
+slug: "developers"
+weight: 40
+toc: false
+draft: false
+menu:
+  sidebar:
+    name: "开发者"
+    weight: 50
+    identifier: "developers"
+---
diff --git a/docs/content/doc/developers/guidelines-backend.md b/docs/content/doc/developers/guidelines-backend.md
@@ -0,0 +1,115 @@
+---
+date: "2021-11-01T23:41:00+08:00"
+title: "Guidelines for Backend Development"
+slug: "guidelines-backend"
+weight: 20
+toc: false
+draft: false
+menu:
+  sidebar:
+    parent: "developers"
+    name: "Guidelines for Backend"
+    weight: 20
+    identifier: "guidelines-backend"
+---
+
+# Guidelines for Backend Development
+
+**Table of Contents**
+
+{{< toc >}}
+
+## Background
+
+Gitea uses Golang as the backend programming language. It uses many third-party packages and also write some itself. 
+For example, Gitea uses [Chi](https://github.com/go-chi/chi) as basic web framework. [Xorm](https://xorm.io) is an ORM framework that is used to interact with the database. 
+So it's very important to manage these packages. Please take the below guidelines before you start to write backend code.
+
+## Package Design Guideline
+
+### Packages List
+
+To maintain understandable code and avoid circular dependencies it is important to have a good code structure. The Gitea backend is divided into the following parts:
+
+- `build`: Scripts to help build Gitea.
+- `cmd`: All Gitea actual sub commands includes web, doctor, serv, hooks, admin and etc. `web` will start the web service. `serv` and `hooks` will be invoked by git or openSSH. Other sub commands could help to mantain Gitea.
+- `integrations`: Integration tests
+- `models`: Contains the data structures used by xorm to construct database tables. It also contains functions to query and update the database. Dependencies to other Gitea code should be avoided. You can make exceptions in cases such as logging.
+  - `models/db`: Basic database operations. All other `models/xxx` packages should depend on this package. The `GetEngine` function should only be invoked from `models/`.
+  - `models/fixtures`: Sample data used in unit tests and integration tests. One `yml` file means one table which will be loaded into database when beginning the tests.
+  - `models/migrations`: Stores database migrations between versions. PRs that change a database structure **MUST** also have a migration step.
+- `modules`: Different modules to handle specific functionality in Gitea. Work in Progress: Some of them should be moved to `services`.
+  - `modules/setting`: Store all system configurations read from ini files and has been referenced by everywhere. But they should be used as function parameters when possible.
+  - `modules/git`: Package to interactive with `Git` command line or Gogit package.
+- `public`: Compiled frontend files (javascript, images, css, etc.)
+- `routers`: Handling of server requests. As it uses other Gitea packages to serve the request, other packages (models, modules or services) shall not depend on routers.
+  - `routers/api` Conatins routers for `/api/v1` aims to handle RESTful API requests. 
+  - `routers/install` Could only reponse when system is INSTALL mode. 
+  - `routers/private` will only be invoked by internal sub commands, especially `serv` and `hooks`. 
+  - `routers/web` will handle HTTP requests from web browsers or Git SMART HTTP protocols.
+- `services`: Support functions for common routing operations or command executions. Uses `models` and `modules` to handle the requests.
+- `templates`: Golang templates for generating the html output.
+
+### Package Dependencies
+
+Since Golang don't support import cycles, we have to decide the package dependencies carefully. There are some levels between those packages. Below is the ideal package dependencies direction.
+
+`cmd` -> `routers` -> `services` -> `models` -> `modules`
+
+From left to right, left packages could depend on right packages, but right packages MUST not depend on left packages. The sub packages on the same level could depend on according this level's rules.
+
+**NOTICE**
+
+Why do we need database transactions outside of `models`? And how?
+Some actions should allow for rollback when database record insertion/update/deletion failed. 
+So services must be allowed to create a database transaction. Here is some example,
+
+```go
+// servcies/repository/repo.go
+func CreateXXXX() error {\
+  ctx, committer, err := db.TxContext()
+	if err != nil {
+		return err
+	}
+	defer committer.Close()
+
+  // do something, if return err, it will rollback automatically when `committer.Close()` is invoked.
+  if err := issues.UpdateIssue(ctx, repoID); err != nil {
+      // ...
+  }
+
+  // ......
+
+  return committer.Commit()
+}
+```
+
+You should **not** use `db.GetEngine(ctx)` in `services` directly, but just write a function under `models/`. 
+If the function will be used in the transaction, just let `context.Context` as the function's first parameter.
+
+```go
+// models/issues/issue.go
+func UpdateIssue(ctx context.Context, repoID int64) error {
+    e := db.GetEngine(ctx)
+
+    // ......
+}
+```
+
+### Package Name
+
+For the top level package, use a plural as package name, i.e. `services`, `models`, for sub packages, use singular,
+i.e. `servcies/user`, `models/repository`.
+
+### Import Alias
+
+Since there are many package levels and sub packages, so you will find `modules/user`, `models/user`, `services/user`. When these packages are import into one Go file, it's difficult to know which package we are using and if it's a variable name or an import name. So we recommand to always use import alias. To differ from package variables which are commonly use camelCase, just use **snake_case** as import package alias.
+i.e. `import user_service "code.Gitea.io/Gitea/services/user"`
+
+### Future Tasks
+
+Currently, we are creating some refactors to do the following things:
+
+- Correct that codes which doesn't follow the rules.
+- There are too many files in `models`, so we are moving some of them into a sub package `models/xxx`.
+- Some `modules` sub packages should be moved to `services` because they depends on `models`.
diff --git a/models/ssh_key_authorized_keys.go b/models/ssh_key_authorized_keys.go
@@ -39,7 +39,7 @@ import (
 
 const (
 	tplCommentPrefix = `# gitea public key`
-	tplPublicKey     = tplCommentPrefix + "\n" + `command=%s,no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty %s` + "\n"
+	tplPublicKey     = tplCommentPrefix + "\n" + `command=%s,no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty,no-user-rc,restrict %s` + "\n"
 )
 
 var sshOpLocker sync.Mutex
diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini
@@ -858,8 +858,6 @@ migrate.clone_address=Migrovat / klonovat z URL
 migrate.clone_address_desc=HTTP(S) nebo URL pro klonování existujícího repozitáře
 migrate.clone_local_path=nebo místní cesta serveru
 migrate.permission_denied=Není dovoleno importovat místní repozitáře.
-migrate.permission_denied_blocked=Nemáte oprávnění provést import z blokovaných serverů.
-migrate.permission_denied_private_ip=Nemáte oprávnění provést import ze soukromých IP adres.
 migrate.invalid_local_path=Místní cesta je neplatná, buď neexistuje nebo není adresářem.
 migrate.invalid_lfs_endpoint=Koncový bod LFS není platný.
 migrate.failed=Přenesení selhalo: %v
diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini
@@ -884,8 +884,6 @@ migrate.clone_address=Migrations- / Klon-URL
 migrate.clone_address_desc=Die HTTP(S)- oder „git clone“-URL eines bereits existierenden Repositorys
 migrate.clone_local_path=oder ein lokaler Serverpfad
 migrate.permission_denied=Du hast keine Berechtigung zum Importieren lokaler Repositories.
-migrate.permission_denied_blocked=Du darfst nicht von geblockten Hosts importieren.
-migrate.permission_denied_private_ip=Du darfst nicht von privaten IP-Addressen importieren.
 migrate.invalid_local_path=Der lokale Pfad ist ungültig, existiert nicht oder ist kein Ordner.
 migrate.invalid_lfs_endpoint=Ungültiger LFS Endpunkt.
 migrate.failed=Fehler bei der Migration: %v
diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini
@@ -899,8 +899,6 @@ migrate.clone_address_desc=Το HTTP(S) ή Git URL 'κλωνοποίησης' ε
 migrate.github_token_desc=Μπορείτε να βάλετε ένα ή περισσότερα διακριτικά χωρίζοντας τα με κόμμα, ώστε να κάνετε τη μεταφορά γρηγορότερη, επειδή το API του Github έχει όριο ρυθμού. ΠΡΟΣΟΧΗ: Η κατάχρηση αυτής της δυνατότητας μπορεί να παραβιάσει την πολιτική του παρόχου υπηρεσιών και να οδηγήσει σε αποκλεισμό λογαριασμού.
 migrate.clone_local_path=ή μια διαδρομή τοπικού διακομιστή
 migrate.permission_denied=Δεν επιτρέπεται η εισαγωγή τοπικών αποθετηρίων.
-migrate.permission_denied_blocked=Δεν επιτρέπεται η εισαγωγή από αποκλεισμένους υπολογιστές.
-migrate.permission_denied_private_ip=Δεν επιτρέπεται η εισαγωγή από ιδιωτικές IPs.
 migrate.invalid_local_path=Η τοπική διαδρομή δεν είναι έγκυρη. Δεν υπάρχει ή δεν είναι φάκελος.
 migrate.invalid_lfs_endpoint=Η διεύθυνση LFS δεν είναι έγκυρο.
 migrate.failed=Η μεταφορά απέτυχε: %v
diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini
@@ -895,8 +895,6 @@ migrate.clone_address_desc=La URL HTTP(S) o de Git 'clone' de un repositorio exi
 migrate.github_token_desc=Puedes poner uno o más tokens con comas separadas aquí para hacer migrar más rápido debido al límite de velocidad de Github API. PRECAUCIÓN: Abusar esta característica puede violar la política del proveedor de servicios y llevar a bloquear la cuenta.
 migrate.clone_local_path=o una ruta local del servidor
 migrate.permission_denied=No te está permitido importar repositorios locales.
-migrate.permission_denied_blocked=No está permitido importar desde hosts bloqueados.
-migrate.permission_denied_private_ip=No está permitido importar desde direcciones IP privadas.
 migrate.invalid_local_path=La ruta local es inválida. No existe o no es un directorio.
 migrate.invalid_lfs_endpoint=El punto final de LFS no es válido.
 migrate.failed=Migración fallida: %v
diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini
@@ -833,8 +833,6 @@ migrate.clone_address=Migrer/Cloner depuis une URL
 migrate.clone_address_desc=L'URL HTTP(S) ou Git "clone" d'un dépôt existant
 migrate.clone_local_path=ou un chemin serveur local
 migrate.permission_denied=Vous n'êtes pas autorisé à importer des dépôts locaux.
-migrate.permission_denied_blocked=Vous n'êtes pas autorisé à importer à partir d'hôtes bloqués.
-migrate.permission_denied_private_ip=Vous n'êtes pas autorisé à importer depuis des adresses IP privées.
 migrate.invalid_local_path=Chemin local non valide, non existant ou n'étant pas un dossier.
 migrate.invalid_lfs_endpoint=Le point d'accès LFS n'est pas valide.
 migrate.failed=Echec de migration: %v
diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini
@@ -899,8 +899,6 @@ migrate.clone_address_desc=既存リポジトリの、HTTP(S)またはGit形式
 migrate.github_token_desc=Github APIはレート制限がありますが、移行をより速くするため、ここにカンマ区切りで複数のトークンを入力することができます。 警告: この機能を悪用すると、サービスプロバイダのポリシーに違反し、アカウントがブロックされる可能性があります。
 migrate.clone_local_path=、またはローカルサーバー上のパス
 migrate.permission_denied=ローカルリポジトリをインポートする権限がありません。
-migrate.permission_denied_blocked=ブロックしているホストからのインポートは禁止されています。
-migrate.permission_denied_private_ip=プライベートIPからのインポートは禁止されています。
 migrate.invalid_local_path=ローカルパスが無効です。 存在しないかディレクトリではありません。
 migrate.invalid_lfs_endpoint=LFS エンドポイントが無効です。
 migrate.failed=移行に失敗しました: %v
diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini
@@ -880,8 +880,6 @@ migrate.clone_address=Klonēšanas adrese
 migrate.clone_address_desc=Tā var būt HTTP(S) adrese vai Git 'clone' URL eksistējošam repozitorijam
 migrate.clone_local_path=vai servera lokālais ceļš
 migrate.permission_denied=Jums nav tiesību importēt lokālu repozitoriju.
-migrate.permission_denied_blocked=Nav atļauts veikt importu no bloķētiem serveriem.
-migrate.permission_denied_private_ip=Nav atļauts veikt importu no bloķētiem no privātām IP adresēm.
 migrate.invalid_local_path=Nederīgs lokālais ceļš. Tas neeksistē vai nav direktorija.
 migrate.invalid_lfs_endpoint=LFS galapunkts nav korekts.
 migrate.failed=Migrācija neizdevās: %v
diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini
@@ -840,8 +840,6 @@ migrate.clone_address_desc=URL HTTP (S) ou Git 'clone' de um repositório existe
 migrate.github_token_desc=Você pode colocar aqui um ou mais tokens separados com vírgula para tornar a migração mais rápida devido ao limite de taxa de API do Github. AVISO: abusar desse recurso pode violar a política do provedor de serviço e levar ao bloqueio da conta.
 migrate.clone_local_path=ou um caminho de servidor local
 migrate.permission_denied=Você não pode importar repositórios locais.
-migrate.permission_denied_blocked=Você não tem permissão para importar de origens bloqueadas.
-migrate.permission_denied_private_ip=Você não tem permissão para importar de IPs privados.
 migrate.invalid_local_path=O caminho local é inválido. Ele não existe ou não é um diretório.
 migrate.invalid_lfs_endpoint=O destino LFS não é válido.
 migrate.failed=Migração falhou: %v
diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini
@@ -898,8 +898,6 @@ migrate.clone_address_desc=O URL de clonagem HTTP(S) ou Git de um repositório e
 migrate.github_token_desc=Pode colocar aqui um ou mais códigos separados por vírgulas para tornar mais rápida a migração, para compensar a limitação de velocidade da API do GitHub. AVISO: O abuso desta funcionalidade poderá violar a política do seu fornecedor de serviço e levar ao bloqueio da conta.
 migrate.clone_local_path=ou um caminho no servidor local
 migrate.permission_denied=Não está autorizado a importar repositórios locais.
-migrate.permission_denied_blocked=Não tem permissão para importar a partir de servidores bloqueados.
-migrate.permission_denied_private_ip=Não tem permissão para importar a partir de IPs privados.
 migrate.invalid_local_path=O caminho local é inválido. Não existe ou não é uma pasta.
 migrate.invalid_lfs_endpoint=O destino LFS não é válido.
 migrate.failed=A migração falhou: %v
diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini
@@ -886,8 +886,6 @@ migrate.clone_address=Перенос / Клонирование по URL
 migrate.clone_address_desc=Это может быть HTTP/HTTPS/GIT адрес или локальный путь существующего репозитория на сервере.
 migrate.clone_local_path=или путь к локальному серверу
 migrate.permission_denied=У вас нет прав на импорт локальных репозиториев.
-migrate.permission_denied_blocked=Вам не разрешено импортировать с заблокированных узлов.
-migrate.permission_denied_private_ip=Вы не можете импортировать с приватных IP.
 migrate.invalid_local_path=Недопустимый локальный путь. Возможно он не существует или не является папкой.
 migrate.invalid_lfs_endpoint=Конечная точка LFS недействительна.
 migrate.failed=Миграция не удалась: %v
diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini
@@ -868,8 +868,6 @@ migrate.clone_address=URL'den Taşı / Klonla
 migrate.clone_address_desc=Varolan bir deponun HTTP(S) veya Git 'klonlama' URL'si
 migrate.clone_local_path=veya bir yerel sunucu yolu
 migrate.permission_denied=Yerel depoları içeri aktarma izniniz yok.
-migrate.permission_denied_blocked=Engellenen ana bilgisayarlardan içeri aktarmanıza izin verilmiyor.
-migrate.permission_denied_private_ip=Özel IP'lerden içeri aktarmanıza izin verilmiyor.
 migrate.invalid_local_path=Yerel yol geçersiz. Mevcut değil veya bir dizin değil.
 migrate.invalid_lfs_endpoint=LFS Uç noktası geçerli değil.
 migrate.failed=Göç başarısız: %v
diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini
@@ -860,8 +860,6 @@ migrate.clone_address=Міграція / клонувати з URL-адреси
 migrate.clone_address_desc=URL-адреса HTTP(S) або Git "clone" існуючого репозиторія
 migrate.clone_local_path=або шлях до локального серверу
 migrate.permission_denied=Вам не дозволено імпортувати локальні репозиторії.
-migrate.permission_denied_blocked=Вам не дозволено імпортувати з заблокованих хостів.
-migrate.permission_denied_private_ip=Вам не дозволено імпортувати з приватних IP-адрес.
 migrate.invalid_local_path=Локальний шлях недійсний. Він не існує або не є каталогом.
 migrate.invalid_lfs_endpoint=Помилкова кінцева точка LFS.
 migrate.failed=Міграція не вдалася: %v
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
@@ -899,8 +899,6 @@ migrate.clone_address_desc=现有仓库的 HTTP(s) 或 Git "clone" URL
 migrate.github_token_desc=由于 Github API 速率限制，您可以在此处放置一个或多个以逗号分隔的令牌，以加快迁移速度。警告：滥用此功能可能会违反服务提供商的政策并导致帐户被封。
 migrate.clone_local_path=或服务器本地路径
 migrate.permission_denied=您没有获得导入本地仓库的权限。
-migrate.permission_denied_blocked=不允许从被屏蔽的主机导入。
-migrate.permission_denied_private_ip=不允许从私有IP导入。
 migrate.invalid_local_path=无效的本地路径，不存在或不是一个目录！
 migrate.invalid_lfs_endpoint=LFS 网址无效。
 migrate.failed=迁移失败：%v
diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini
@@ -899,8 +899,7 @@ migrate.clone_address_desc=現有存儲庫的 HTTP(S) 或 Git Clone URL
 migrate.github_token_desc=由於 Github API 的速率限制，您可在此輸入一個或多個由半形逗號「,」分隔的 Token 來加快遷移速度。警告：濫用此功能可能會違反該服務提供者的政策並導致帳戶被封鎖。
 migrate.clone_local_path=或者是本地端伺服器路徑
 migrate.permission_denied=您並沒有導入本地儲存庫的權限。
-migrate.permission_denied_blocked=您未被允許從已封鎖的主機匯入。
-migrate.permission_denied_private_ip=您未被允許從私有 IP 匯入。
+migrate.permission_denied_blocked=您無法從未允許的主機匯入，請聯絡管理員檢查以下設定值 ALLOWED_DOMAINS/ALLOW_LOCALNETWORKS/BLOCKED_DOMAINS
 migrate.invalid_local_path=無效的本地路徑，該路徑不存在或不是一個目錄！
 migrate.invalid_lfs_endpoint=該 LFS 端點無效。
 migrate.failed=遷移失敗：%v
@@ -2043,6 +2042,7 @@ diff.file_suppressed=檔案差異因為檔案過大而無法顯示
 diff.file_suppressed_line_too_long=檔案差異因為一行或多行太長而無法顯示
 diff.too_many_files=本差異變更的檔案數量過多導致部分檔案未顯示
 diff.show_more=顯示更多
+diff.load=載入差異
 diff.generated=generated
 diff.vendored=vendored
 diff.comment.placeholder=留言...
diff --git a/templates/repo/commits_list.tmpl b/templates/repo/commits_list.tmpl
@@ -23,7 +23,8 @@
 								{{$userName}}
 							{{end}}
 						</td>
-						<td class="sha">
+						<td class="sha df">
+							<button class="ui button copy-commit-sha df ac" data-clipboard-text="{{.ID}}">{{svg "octicon-copy" 14}}</button>
 							{{$class := "ui sha label"}}
 							{{if .Signature}}
 								{{$class = (printf "%s%s" $class " isSigned")}}
@@ -66,7 +67,7 @@
 							{{end}}
 							</span>
 							{{if IsMultilineCommitMessage .Message}}
-							<button class="basic compact mini ui icon button commit-button"><i class="ellipsis horizontal icon"></i></button>
+							<button class="ui button ellipsis-button" aria-expanded="false">...</button>
 							{{end}}
 							{{template "repo/commit_statuses" dict "Status" .Status "Statuses" .Statuses "root" $}}
 							{{if IsMultilineCommitMessage .Message}}
diff --git a/templates/repo/commits_list_small.tmpl b/templates/repo/commits_list_small.tmpl
diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl
diff --git a/web_src/js/features/repo-commit.js b/web_src/js/features/repo-commit.js
diff --git a/web_src/js/index.js b/web_src/js/index.js
diff --git a/web_src/less/_base.less b/web_src/less/_base.less
diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ import (`
`39`	`39`
`40`	`40`	`const (`
`41`	`41`	tplCommentPrefix = `# gitea public key`
`42`		- tplPublicKey = tplCommentPrefix + "\n" + `command=%s,no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty %s` + "\n"
	`42`	+ tplPublicKey = tplCommentPrefix + "\n" + `command=%s,no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty,no-user-rc,restrict %s` + "\n"
`43`	`43`	`)`
`44`	`44`
`45`	`45`	`var sshOpLocker sync.Mutex`