Merge branch 'master' into lunny/fix_archive

Author: 6543

.drone.yml

@@ -717,7 +717,7 @@ steps:
 
   - name: publish
     pull: always
-    image: plugins/docker:linux-amd64
+    image: techknowlogick/drone-docker:latest
     settings:
       auto_tag: true
       auto_tag_suffix: linux-amd64
@@ -734,7 +734,7 @@ steps:
         - pull_request
 
   - name: publish-rootless
-    image: plugins/docker:linux-amd64
+    image: techknowlogick/drone-docker:latest
     settings:
       dockerfile: Dockerfile.rootless
       auto_tag: true
@@ -772,7 +772,7 @@ trigger:
 steps:
   - name: dryrun
     pull: always
-    image: plugins/docker:linux-arm64
+    image: techknowlogick/drone-docker:latest
     settings:
       dry_run: true
       repo: gitea/gitea
@@ -814,7 +814,7 @@ steps:
 
   - name: publish
     pull: always
-    image: plugins/docker:linux-arm64
+    image: techknowlogick/drone-docker:latest
     settings:
       auto_tag: true
       auto_tag_suffix: linux-arm64
@@ -834,7 +834,7 @@ steps:
         - pull_request
 
   - name: publish-rootless
-    image: plugins/docker:linux-arm64
+    image: techknowlogick/drone-docker:latest
     settings:
       dockerfile: Dockerfile.rootless
       auto_tag: true

docs/content/doc/usage/email-setup.en-us.md

@@ -19,12 +19,15 @@ menu:
 
 {{< toc >}}
 
-To use Gitea's built-in Email support, update the `app.ini` config file [mailer] section:
+Gitea has mailer functionality for sending transactional emails (such as registration confirmation). It can be configured to either use Sendmail (or compatible MTAs like Postfix and msmtp) or directly use SMTP server.
 
-## Sendmail version
+## Using Sendmail
 
-Use the operating system’s sendmail command instead of SMTP. This is common on Linux servers.  
-Note: For use in the official Gitea Docker image, please configure with the SMTP version.
+Use `sendmail` command as mailer.
+
+Note: For use in the official Gitea Docker image, please configure with the SMTP version (see the following section).
+
+Note: For Internet-facing sites consult documentation of your MTA for instructions to send emails over TLS. Also set up SPF, DMARC, and DKIM DNS records to make emails sent be accepted as legitimate by various email providers.
 
 ```ini
 [mailer]
@@ -34,7 +37,9 @@ MAILER_TYPE   = sendmail
 SENDMAIL_PATH = /usr/sbin/sendmail
 ```
 
-## SMTP version
+## Using SMTP
+
+Directly use SMTP server as relay. This option is useful if you don't want to set up MTA on your instance but you have an account at email provider.
 
 ```ini
 [mailer]
@@ -47,17 +52,19 @@ USER           = [email protected]
 PASSWD         = `password`
 ```
 
-- Restart Gitea for the configuration changes to take effect.
+Restart Gitea for the configuration changes to take effect.
 
-- To send a test email to validate the settings, go to Gitea > Site Administration > Configuration > SMTP Mailer Configuration.
+To send a test email to validate the settings, go to Gitea > Site Administration > Configuration > SMTP Mailer Configuration.
 
 For the full list of options check the [Config Cheat Sheet]({{< relref "doc/advanced/config-cheat-sheet.en-us.md" >}})
 
-- Please note: authentication is only supported when the SMTP server communication is encrypted with TLS or `HOST=localhost`. TLS encryption can be through:
-  - Via the server supporting TLS through STARTTLS - usually provided on port 587. (Also known as Opportunistic TLS.)
-  - SMTPS connection (SMTP over transport layer security) via the default port 465.
+Please note: authentication is only supported when the SMTP server communication is encrypted with TLS or `HOST=localhost`. TLS encryption can be through:
+  - STARTTLS (also known as Opportunistic TLS) via port 587. Initial connection is done over cleartext, but then be upgraded over TLS if the server supports it.
+  - SMTPS connection (SMTP over TLS) via the default port 465. Connection to the server use TLS from the beginning.
   - Forced SMTPS connection with `IS_TLS_ENABLED=true`. (These are both known as Implicit TLS.)
-- This is due to protections imposed by the Go internal libraries against STRIPTLS attacks.
+This is due to protections imposed by the Go internal libraries against STRIPTLS attacks.
+
+Note that Implicit TLS is recommended by [RFC8314](https://tools.ietf.org/html/rfc8314#section-3) since 2018.
 
 ### Gmail
 
@@ -74,3 +81,4 @@ MAILER_TYPE    = smtp
 IS_TLS_ENABLED = true
 HELO_HOSTNAME  = example.com
 ```
+

models/issue.go

@@ -1018,6 +1018,9 @@ func NewIssue(repo *Repository, issue *Issue, labelIDs []int64, uuids []string)
 
 // GetIssueByIndex returns raw issue without loading attributes by index in a repository.
 func GetIssueByIndex(repoID, index int64) (*Issue, error) {
+	if index < 1 {
+		return nil, ErrIssueNotExist{}
+	}
 	issue := &Issue{
 		RepoID: repoID,
 		Index:  index,

modules/markup/external/external.go

@@ -98,6 +98,10 @@ func (p *Renderer) Render(ctx *markup.RenderContext, input io.Reader, output io.
 		args = append(args, f.Name())
 	}
 
+	if ctx == nil || ctx.Ctx == nil {
+		return fmt.Errorf("RenderContext did not provide context")
+	}
+
 	processCtx, cancel := context.WithCancel(ctx.Ctx)
 	defer cancel()
 

options/locale/locale_de-DE.ini

@@ -326,8 +326,6 @@ hi_user_x=Hallo <b>%s</b>,
 
 activate_account=Bitte aktiviere dein Konto
 activate_account.title=%s, bitte aktiviere dein Konto
-activate_account.test_1=Hallo <b>%[1]s</b>, danke für deine Registrierung bei %[2]!
-activate_account.test_2=Bitte klicke innerhalb von <b>%s</b> auf folgenden Link, um dein Konto zu aktivieren:
 
 activate_email=Bestätige deine E-Mail-Adresse
 activate_email.title=%s, bitte verifiziere deine E-Mail-Adresse

options/locale/locale_es-ES.ini

@@ -321,8 +321,6 @@ hi_user_x=Hola <b>%s</b>,
 
 activate_account=Por favor, active su cuenta
 activate_account.title=%s, por favor activa tu cuenta
-activate_account.test_1=¡Hola <b>%[1]s</b>, gracias por registrarte en %[2]!
-activate_account.test_2=Haga clic en el siguiente enlace para activar su cuenta dentro de <b>%s</b>:
 
 activate_email=Verifique su correo electrónico
 activate_email.title=%s, por favor verifica tu dirección de correo electrónico

options/locale/locale_ja-JP.ini

@@ -324,8 +324,6 @@ hi_user_x=こんにちは、<b>%s</b> さん。
 
 activate_account=あなたのアカウントをアクティベートしてください。
 activate_account.title=%s さん、アカウントをアクティベートしてください
-activate_account.test_1=こんにちは、<b>%[1]s</b> さん。 %[2]s へのご登録ありがとうございます！
-activate_account.test_2=あなたのアカウントを有効化するため、<b>%s</b>以内に次のリンクをクリックしてください:
 
 activate_email=メール アドレスを確認します
 activate_email.title=%s さん、メールアドレス確認をお願いします

options/locale/locale_pt-PT.ini

@@ -323,8 +323,8 @@ hi_user_x=Olá <b>%s</b>,
 
 activate_account=Por favor, ponha a sua conta em funcionamento
 activate_account.title=%s, por favor habilite a sua conta
-activate_account.test_1=Olá <b>%[1]s</b>, obrigado por se registar em %[2]s!
-activate_account.test_2=Por favor clique na seguinte ligação para habilitar a sua conta em <b>%s</b>:
+activate_account.text_1=Olá <b>%[1]s</b>, obrigado por se registar em %[2]s!
+activate_account.text_2=Clique, por favor, na ligação seguinte para activar a sua conta dentro de <b>%s</b>:
 
 activate_email=Verifique o seu endereço de email
 activate_email.title=%s, por favor verifique o seu endereço de email

options/locale/locale_zh-TW.ini

@@ -324,8 +324,6 @@ hi_user_x=<b>%s</b> 您好，
 
 activate_account=請啟用您的帳戶
 activate_account.title=%s，請啟用您的帳戶
-activate_account.test_1=<b>%[1]s</b> 您好，感謝您註冊 %[2]s！
-activate_account.test_2=請在 <b>%s</b>內點擊下列連結以啟用您的帳戶：
 
 activate_email=請驗證您的電子信箱
 activate_email.title=%s，請驗證您的電子信箱

routers/web/repo/view.go

@@ -336,6 +336,7 @@ func renderDirectory(ctx *context.Context, treeLink string) {
 					ctx.Data["MarkupType"] = string(markupType)
 					var result strings.Builder
 					err := markup.Render(&markup.RenderContext{
+						Ctx:       ctx,
 						Filename:  readmeFile.name,
 						URLPrefix: readmeTreelink,
 						Metas:     ctx.Repo.Repository.ComposeDocumentMetas(),
@@ -511,6 +512,7 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
 			ctx.Data["MarkupType"] = markupType
 			var result strings.Builder
 			err := markup.Render(&markup.RenderContext{
+				Ctx:       ctx,
 				Filename:  blob.Name(),
 				URLPrefix: path.Dir(treeLink),
 				Metas:     ctx.Repo.Repository.ComposeDocumentMetas(),
@@ -570,6 +572,7 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
 			ctx.Data["MarkupType"] = markupType
 			var result strings.Builder
 			err := markup.Render(&markup.RenderContext{
+				Ctx:       ctx,
 				Filename:  blob.Name(),
 				URLPrefix: path.Dir(treeLink),
 				Metas:     ctx.Repo.Repository.ComposeDocumentMetas(),