Merge branch 'master' into lunny/rename_middlewares

custom/conf/app.example.ini

@@ -863,8 +863,6 @@ ROOT_PATH =
 MODE = console
 ; Buffer length of the channel, keep it as it is if you don't know what it is.
 BUFFER_LEN = 10000
-REDIRECT_MACARON_LOG = false
-MACARON = file
 ; Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is "Info"
 ROUTER_LOG_LEVEL = Info
 ROUTER = console

docker/root/etc/templates/app.ini

@@ -47,8 +47,6 @@ PATH = /data/gitea/attachments
 [log]
 MODE = console
 LEVEL = info
-REDIRECT_MACARON_LOG = true
-MACARON = console
 ROUTER = console
 ROOT_PATH = /data/gitea/log
 

docs/config.yaml

@@ -147,27 +147,27 @@ languages:
           url: https://blog.gitea.io/
           weight: 30
           pre: rss
-        - name: 程式碼
-          url: https://code.gitea.io/
+        - name: 商店
+          url: https://shop.gitea.io/
           weight: 40
-          pre: code
-        - name: 翻译
+          pre: shopping-cart
+        - name: 翻譯
           url: https://crowdin.com/project/gitea
           weight: 41
           pre: language
-        - name: 下载
+        - name: 下載
           url: https://dl.gitea.io/
           weight: 50
           pre: download
         - name: GitHub
           url: https://github.com/go-gitea/
           weight: 60
           pre: github
-        - name: Discord Chat
+        - name: Discord 聊天室
           url: https://discord.gg/Gitea
           weight: 70
           pre: comment
-        - name: Forum
+        - name: 討論區
           url: https://discourse.gitea.io/
           weight: 80
           pre: group

docs/content/doc/advanced.zh-tw.md

@@ -0,0 +1,13 @@
+---
+date: "2016-12-01T16:00:00+02:00"
+title: "進階"
+slug: "advanced"
+weight: 30
+toc: false
+draft: false
+menu:
+  sidebar:
+    name: "進階"
+    weight: 40
+    identifier: "advanced"
+---

docs/content/doc/advanced/config-cheat-sheet.en-us.md

@@ -611,7 +611,7 @@ Default templates for project boards:
 - `STACKTRACE_LEVEL`: **None**: Default log level at which to log create stack traces. \[Trace, Debug, Info, Warn, Error, Critical, Fatal, None\]
 - `ROUTER_LOG_LEVEL`: **Info**: The log level that the router should log at. (If you are setting the access log, its recommended to place this at Debug.)
 - `ROUTER`: **console**: The mode or name of the log the router should log to. (If you set this to `,` it will log to default gitea logger.)
-NB: You must `REDIRECT_MACARON_LOG` and have `DISABLE_ROUTER_LOG` set to `false` for this option to take effect. Configure each mode in per mode log subsections `\[log.modename.router\]`.
+NB: You must have `DISABLE_ROUTER_LOG` set to `false` for this option to take effect. Configure each mode in per mode log subsections `\[log.modename.router\]`.
 - `ENABLE_ACCESS_LOG`: **false**: Creates an access.log in NCSA common log format, or as per the following template
 - `ACCESS`: **file**: Logging mode for the access logger, use a comma to separate values. Configure each mode in per mode log subsections `\[log.modename.access\]`. By default the file mode will log to `$ROOT_PATH/access.log`. (If you set this to `,` it will log to the default gitea logger.)
 - `ACCESS_LOG_TEMPLATE`: **`{{.Ctx.RemoteAddr}} - {{.Identity}} {{.Start.Format "[02/Jan/2006:15:04:05 -0700]" }} "{{.Ctx.Req.Method}} {{.Ctx.Req.URL.RequestURI}} {{.Ctx.Req.Proto}}" {{.ResponseWriter.Status}} {{.ResponseWriter.Size}} "{{.Ctx.Req.Referer}}\" \"{{.Ctx.Req.UserAgent}}"`**: Sets the template used to create the access log.

docs/content/doc/advanced/environment-variables.en-us.md

@@ -58,15 +58,6 @@ For documentation about each of the variables available, refer to the
 - `HOMEDRIVE`: Main drive path used to access the home directory (C:)
 - `HOMEPATH`: Home relative path in the given home drive path
 
-## Macaron (framework used by Gitea)
-
-- `HOST`: Host Macaron will listen on
-- `PORT`: Port Macaron will listen on
-- `MACARON_ENV`: global variable to provide special functionality for development environments
-  vs. production environments. If MACARON_ENV is set to "" or "development", then templates will
-  be recompiled on every request. For more performance, set the MACARON_ENV environment variable
-  to "production".
-
 ## Miscellaneous
 
 - `SKIP_MINWINSVC`: If set to 1, do not run as a service on Windows.

docs/content/doc/advanced/environment-variables.zh-cn.md

@@ -50,13 +50,6 @@ GITEA_CUSTOM=/home/gitea/custom ./gitea web
   * `HOMEDRIVE`: 用于访问 home 目录的主驱动器路径（C盘）
   * `HOMEPATH`：在指定主驱动器下的 home 目录相对路径
 
-## Macaron（Gitea 使用的 web 框架）
-
-  * `HOST`：Macaron 监听的主机地址
-  * `PORT`：Macaron 监听的端口地址
-  * `MACARON_ENV`：为开发环境和生产环境提供特殊功能性配置的全局变量，当 MACARON_ENV 设置为 "" 或 "development"
-  时，每次请求都会重编译页面模板。为了提高性能表现，可将它设置为 "production"。
-
 ## Miscellaneous
 
   * `SKIP_MINWINSVC`：如果设置为 1，在 Windows 上不会以 service 的形式运行。

docs/content/doc/advanced/logging-documentation.en-us.md

@@ -27,7 +27,6 @@ The fundamental thing to be aware of in Gitea is that there are several
 log groups:
 
 - The "Default" logger
-- The Macaron logger
 - The Router logger
 - The Access logger
 - The XORM logger
@@ -74,8 +73,7 @@ You can disable Router log by setting `DISABLE_ROUTER_LOG`.
 You can configure the outputs of this
 router log by setting the `ROUTER` value in the `[log]` section of the
 configuration. `ROUTER` will default to `console` if unset. The Gitea
-Router logs the same data as the Macaron log but has slightly different
-coloring. It logs at the `Info` level by default, but this can be
+Router logs at the `Info` level by default, but this can be
 changed if desired by setting the `ROUTER_LOG_LEVEL` value.
 
 Please note, setting the `LEVEL` of this logger to a level above
@@ -182,7 +180,7 @@ Certain configuration is common to all modes of log output:
 - `STACKTRACE_LEVEL` is the lowest level that this output will print
   a stacktrace. This value is inherited.
 - `MODE` is the mode of the log output. It will default to the sublogger
-  name. Thus `[log.console.macaron]` will default to `MODE = console`.
+  name. Thus `[log.console.router]` will default to `MODE = console`.
 - `COLORIZE` will default to `true` for `console` as
   described, otherwise it will default to `false`.
 
@@ -280,8 +278,6 @@ LOG_SQL = false ; SQL logs are rarely helpful unless we specifically ask for the
 [log]
 MODE = console
 LEVEL = debug ; please set the level to debug when we are debugging a problem
-REDIRECT_MACARON_LOG = true
-MACARON = console
 ROUTER = console
 COLORIZE = false ; this can be true if you can strip out the ansi coloring
 ```
@@ -314,7 +310,6 @@ ROOT_PATH = %(GITEA_WORK_DIR)/log
 MODE = console
 LEVEL = Info
 STACKTRACE_LEVEL = None
-REDIRECT_MACARON_LOG = false
 ENABLE_ACCESS_LOG = false
 ENABLE_XORM_LOG = true
 XORM = ,
@@ -345,7 +340,7 @@ recommended that pausing only done for a very short period of time.
 ## Adding and removing logging whilst Gitea is running
 
 It is possible to add and remove logging whilst Gitea is running using the `gitea manager logging add` and `remove` subcommands.
-This functionality can only adjust running log systems and cannot be used to start the access, macaron or router loggers if they
+This functionality can only adjust running log systems and cannot be used to start the access or router loggers if they
 were not already initialised. If you wish to start these systems you are advised to adjust the app.ini and (gracefully) restart
 the Gitea service.
 

docs/content/doc/developers.zh-tw.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"
+---

docs/content/doc/developers/integrations.zh-tw.md

@@ -0,0 +1,22 @@
+---
+date: "2019-04-15T17:29:00+08:00"
+title: "整合"
+slug: "integrations"
+weight: 40
+toc: false
+draft: false
+menu:
+  sidebar:
+    parent: "developers"
+    name: "整合"
+    weight: 65
+    identifier: "integrations"
+---
+
+# 整合
+
+Gitea 有著很棒的第三方整合社群， 以及其它有著一流支援的專案。
+
+我們持續的整理一份清單以追蹤他們！請到 [awesome-gitea](https://gitea.com/gitea/awesome-gitea) 查看。
+
+如果您正在找尋有關 [CI/CD](https://gitea.com/gitea/awesome-gitea#devops)、[SDK](https://gitea.com/gitea/awesome-gitea#sdk) 或是其它佈景主題，您可以在存儲庫 [awesome-gitea](https://gitea.com/gitea/awesome-gitea) 找到他們。

docs/content/doc/developers/migrations.zh-tw.md

@@ -0,0 +1,39 @@
+---
+date: "2019-04-15T17:29:00+08:00"
+title: "遷移介面"
+slug: "migrations-interfaces"
+weight: 30
+toc: false
+draft: false
+menu:
+  sidebar:
+    parent: "developers"
+    name: "遷移介面"
+    weight: 55
+    identifier: "migrations-interfaces"
+---
+
+# 遷移功能
+
+完整的遷移從 Gitea 1.9.0 開始提供。它定義了兩個介面用來從其它 Git 託管平臺遷移儲存庫資料到 Gitea，未來或許會提供遷移到其它 git 託管平臺。
+目前已實作了從 Github, Gitlab 和其它 Gitea 遷移資料。
+
+Gitea 定義了一些基本物件於套件 [modules/migrations/base](https://github.com/go-gitea/gitea/tree/master/modules/migrations/base)。  
+分別是 `Repository`, `Milestone`, `Release`, `ReleaseAsset`, `Label`, `Issue`, `Comment`, `PullRequest`, `Reaction`, `Review`, `ReviewComment`。
+
+## Downloader 介面
+
+從新的 Git 託管平臺遷移，有兩個新的步驟。
+
+- 您必須實作一個 `Downloader`，它用來取得儲存庫資訊。
+- 您必須實作一個 `DownloaderFactory`，它用來偵測 URL 是否符合並建立上述的 `Downloader`。
+  - 您需要在 `init()` 透過 `RegisterDownloaderFactory` 來註冊 `DownloaderFactory`。
+
+您可以在 [downloader.go](https://github.com/go-gitea/gitea/blob/master/modules/migrations/base/downloader.go) 中找到這些介面。
+
+## Uploader 介面
+
+目前只有 `GiteaLocalUploader` 被實作出來，所以我們只能通過 `Uploader` 儲存已下載的資料到本地的 Gitea 實例。
+目前尚未支援其它 Uploader。
+
+您可以在 [uploader.go](https://github.com/go-gitea/gitea/blob/master/modules/migrations/base/uploader.go) 中找到這些介面。

docs/content/doc/developers/oauth2-provider.zh-tw.md

@@ -0,0 +1,96 @@
+---
+date: "2019-04-19:44:00+01:00"
+title: "OAuth2 提供者"
+slug: "oauth2-provider"
+weight: 41
+toc: false
+draft: false
+menu:
+  sidebar:
+    parent: "developers"
+    name: "OAuth2 提供者"
+    weight: 41
+    identifier: "oauth2-provider"
+---
+
+# OAuth2 提供者
+
+**目錄**
+
+{{< toc >}}
+
+Gitea 支援作為 OAuth2 提供者，能讓第三方程式能在使用者同意下存取 Gitea 的資源。此功能自 1.8.0 版開始提供。
+
+## Endpoint
+
+| Endpoint               | URL                         |
+| ---------------------- | --------------------------- |
+| Authorization Endpoint | `/login/oauth/authorize`    |
+| Access Token Endpoint  | `/login/oauth/access_token` |
+
+## 支援的 OAuth2 Grant
+
+目前 Gitea 只支援 [**Authorization Code Grant**](https://tools.ietf.org/html/rfc6749#section-1.3.1) 標準並額外支援下列擴充標準：
+
+- [Proof Key for Code Exchange (PKCE)](https://tools.ietf.org/html/rfc7636)
+- [OpenID Connect (OIDC)](https://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth)
+
+若想要讓第三方程式使用 Authorization Code Grant，需先在「設定」(`/user/settings/applications`)中註冊一個新的應用程式。
+
+## Scope
+
+目前 Gitea 尚未支援 scope （參見 [#4300](https://github.com/go-gitea/gitea/issues/4300)），所有的第三方程式都可獲得該使用者及他所屬的組織中所有資源的存取權。
+
+## 範例
+
+**備註：** 此範例未使用 PKCE。
+
+1. 重新導向使用者到 authorization endpoint 以獲得他同意授權存取資源：
+    <!-- 1. Redirect to user to the authorization endpoint in order to get his/her consent for accessing the resources: -->
+
+   ```curl
+   https://[YOUR-GITEA-URL]/login/oauth/authorize?client_id=CLIENT_ID&redirect_uri=REDIRECT_URI& response_type=code&state=STATE
+   ```
+
+   在設定中註冊應用程式以獲得 `CLIENT_ID`。`STATE` 是一個隨機的字串，它將在使用者授權後發送回您的應用程式。`state` 參數是選用的，但應該要用它來防止 CSRF 攻擊。
+
+   ![Authorization Page](/authorize.png)
+
+   使用者將會被詢問是否授權給您的應用程式。如果它們同意了，使用者將被重新導向到 `REDIRECT_URL`，例如：
+
+   ```curl
+   https://[REDIRECT_URI]?code=RETURNED_CODE&state=STATE
+   ```
+
+1. 使用重新導向提供的 `code`，您可以要求一個新的應用程式和 Refresh Token。Access Token Endpoint 接受 POST 請求使用 `application/json` 或 `application/x-www-form-urlencoded` 類型的請求內容，例如：
+
+   ```curl
+   POST https://[YOUR-GITEA-URL]/login/oauth/access_token
+   ```
+
+   ```json
+   {
+     "client_id": "YOUR_CLIENT_ID",
+     "client_secret": "YOUR_CLIENT_SECRET",
+     "code": "RETURNED_CODE",
+     "grant_type": "authorization_code",
+     "redirect_uri": "REDIRECT_URI"
+   }
+   ```
+
+   回應：
+
+   ```json
+   {
+     "access_token": "eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJnbnQiOjIsInR0IjowLCJleHAiOjE1NTUxNzk5MTIsImlhdCI6MTU1NTE3NjMxMn0.0-iFsAwBtxuckA0sNZ6QpBQmywVPz129u75vOM7wPJecw5wqGyBkmstfJHAjEOqrAf_V5Z-1QYeCh_Cz4RiKug",
+     "token_type": "bearer",
+     "expires_in": 3600,
+     "refresh_token": "eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJnbnQiOjIsInR0IjoxLCJjbnQiOjEsImV4cCI6MTU1NzgwNDMxMiwiaWF0IjoxNTU1MTc2MzEyfQ.S_HZQBy4q9r5SEzNGNIoFClT43HPNDbUdHH-GYNYYdkRfft6XptJBkUQscZsGxOW975Yk6RbgtGvq1nkEcklOw"
+   }
+   ```
+
+   `CLIENT_SECRET` 是產生給此應用程式的唯一密鑰。請記住該密鑰只會在您於 Gitea 建立/註冊應用程式時出現一次。若您遺失密鑰，您必須在該應用程式的設定中重新產生密鑰。
+
+   `access_token` 請求中的 `REDIRECT_URI` 必須符合 `authorize` 請求中的 `REDIRECT_URI`。
+
+1. 發送 [API requests](https://docs.gitea.io/en-us/api-usage#oauth2) 時使用 `access_token` 以存取使用者的資源。