Merge remote-tracking branch 'go-gitea/main' into fix-autofill

Author: wxiaoguang

modules/markup/markdown/goldmark.go

@@ -114,6 +114,7 @@ func (g *ASTTransformer) Transform(node *ast.Document, reader text.Reader, pc pa
 				wrap := ast.NewLink()
 				wrap.Destination = link
 				wrap.Title = v.Title
+				wrap.SetAttributeString("target", []byte("_blank"))
 
 				// Duplicate the current image node
 				image := ast.NewImage(ast.NewLink())

modules/markup/markdown/markdown_test.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 	"testing"
 
+	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/markup"
 	. "code.gitea.io/gitea/modules/markup/markdown"
 	"code.gitea.io/gitea/modules/setting"
@@ -94,10 +95,11 @@ func TestRender_Images(t *testing.T) {
 	title := "Train"
 	href := "https://gitea.io"
 	result := util.URLJoin(AppSubURL, url)
+	// hint: With Markdown v2.5.2, there is a new syntax: [link](URL){:target="_blank"} , but we do not support it now
 
 	test(
 		"!["+title+"]("+url+")",
-		`<p><a href="`+result+`" rel="nofollow"><img src="`+result+`" alt="`+title+`"/></a></p>`)
+		`<p><a href="`+result+`" target="_blank" rel="nofollow noopener"><img src="`+result+`" alt="`+title+`"/></a></p>`)
 
 	test(
 		"[["+title+"|"+url+"]]",
@@ -109,7 +111,7 @@ func TestRender_Images(t *testing.T) {
 	url = "/../../.images/src/02/train.jpg"
 	test(
 		"!["+title+"]("+url+")",
-		`<p><a href="`+result+`" rel="nofollow"><img src="`+result+`" alt="`+title+`"/></a></p>`)
+		`<p><a href="`+result+`" target="_blank" rel="nofollow noopener"><img src="`+result+`" alt="`+title+`"/></a></p>`)
 
 	test(
 		"[["+title+"|"+url+"]]",
@@ -373,6 +375,7 @@ func TestMarkdownRenderRaw(t *testing.T) {
 	}
 
 	for _, testcase := range testcases {
+		log.Info("Test markdown render error with fuzzy data: %x, the following errors can be recovered", testcase)
 		_, err := RenderRawString(&markup.RenderContext{}, string(testcase))
 		assert.NoError(t, err)
 	}
@@ -382,8 +385,8 @@ func TestRenderSiblingImages_Issue12925(t *testing.T) {
 	testcase := `![image1](/image1)
 ![image2](/image2)
 `
-	expected := `<p><a href="/image1" rel="nofollow"><img src="/image1" alt="image1"></a><br>
-<a href="/image2" rel="nofollow"><img src="/image2" alt="image2"></a></p>
+	expected := `<p><a href="/image1" target="_blank" rel="nofollow noopener"><img src="/image1" alt="image1"></a><br>
+<a href="/image2" target="_blank" rel="nofollow noopener"><img src="/image2" alt="image2"></a></p>
 `
 	res, err := RenderRawString(&markup.RenderContext{}, testcase)
 	assert.NoError(t, err)

options/locale/locale_pt-PT.ini

@@ -1370,6 +1370,12 @@ issues.review.un_resolve_conversation=Passar diálogo ao estado de não resolvid
 issues.review.resolved_by=marcou este diálogo como estando concluído
 issues.assignee.error=Nem todos os responsáveis foram adicionados devido a um erro inesperado.
 issues.reference_issue.body=Conteúdo
+issues.content_history.deleted=eliminado
+issues.content_history.edited=editado
+issues.content_history.created=criado
+issues.content_history.delete_from_history=Eliminar do histórico
+issues.content_history.delete_from_history_confirm=Eliminar do histórico?
+issues.content_history.options=Opções
 
 compare.compare_base=base
 compare.compare_head=comparar

options/locale/locale_zh-TW.ini

@@ -1377,6 +1377,12 @@ issues.review.un_resolve_conversation=取消解決對話
 issues.review.resolved_by=標記了此對話為已解決
 issues.assignee.error=因為未預期的錯誤，未能成功指派所有成員。
 issues.reference_issue.body=內容
+issues.content_history.deleted=刪除
+issues.content_history.edited=編輯
+issues.content_history.created=建立
+issues.content_history.delete_from_history=刪除歷程記錄
+issues.content_history.delete_from_history_confirm=刪除歷程記錄？
+issues.content_history.options=選項
 
 compare.compare_base=基底分支
 compare.compare_head=比較
@@ -1985,6 +1991,12 @@ settings.lfs_pointers.inRepo=在儲存庫中
 settings.lfs_pointers.exists=存在於存放區
 settings.lfs_pointers.accessible=使用者可存取
 settings.lfs_pointers.associateAccessible=關聯可存取的 %d 個 OID
+settings.rename_branch_failed_exist=無法重新命名分支，因為目標分支 %s 已存在。
+settings.rename_branch_failed_not_exist=無法重新命名分支 %s，因為他不存在。
+settings.rename_branch_success=分支 %s 已成功被重新命名為 %s。
+settings.rename_branch_from=原分支名稱
+settings.rename_branch_to=新分支名稱
+settings.rename_branch=重新命名分支
 
 diff.browse_source=瀏覽代碼
 diff.parent=父節點
@@ -2106,6 +2118,7 @@ branch.create_new_branch=從下列分支建立分支：
 branch.confirm_create_branch=建立分支
 branch.new_branch=建立新分支
 branch.new_branch_from=從「%s」建立新分支
+branch.renamed=分支 %s 被重新命名為 %s。
 
 tag.create_tag=建立標籤 <strong>%s</strong>
 tag.create_success=已建立標籤「%s」。

routers/web/user/auth.go

@@ -628,7 +628,7 @@ func SignInOAuthCallback(ctx *context.Context) {
 	}
 
 	if u == nil {
-		if !(setting.Service.DisableRegistration || setting.Service.AllowOnlyInternalRegistration) && setting.OAuth2Client.EnableAutoRegistration {
+		if !setting.Service.AllowOnlyInternalRegistration && setting.OAuth2Client.EnableAutoRegistration {
 			// create new user with details from oauth2 provider
 			var missingFields []string
 			if gothUser.UserID == "" {