Merge branch 'master' into team_mention_tribute

Author: a1012112796

CHANGELOG.md

@@ -4,7 +4,7 @@ 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.13.0-RC1](https://github.com/go-gitea/gitea/releases/tag/v1.13.0-RC1) - 2020-10-14
+## [1.13.0-RC1](https://github.com/go-gitea/gitea/releases/tag/v1.13.0-rc1) - 2020-10-14
 
 * SECURITY
   * Mitigate Security vulnerability in the git hook feature (#13058)

MAINTAINERS

@@ -37,3 +37,4 @@ Mura Li <[email protected]> (@typeless)
 jaqra <[email protected]> (@jaqra)
 David Svantesson <[email protected]> (@davidsvantesson)
 CirnoT <[email protected]> (@CirnoT)
+a1012112796 <[email protected]> (@a1012112796)

options/locale/locale_zh-TW.ini

@@ -684,6 +684,7 @@ pick_reaction=選擇你的表情反應
 reactions_more=再多添加 %d個
 unit_disabled=網站管理員已經停用這個儲存庫區域。
 language_other=其它
+adopt_preexisting_content=從 %s 建立儲存庫
 delete_preexisting_label=刪除
 
 desc.private=私有
@@ -963,7 +964,7 @@ issues.self_assign_at=`指派給自己 %s`
 issues.add_assignee_at=`被<b>%s</b>指派 %s`
 issues.remove_assignee_at=`被<b>%s</b>取消指派 %s`
 issues.remove_self_assignment=`取消指派給自己 %s`
-issues.change_title_at=`將標題從 <b><strike>%s</strike></b> 改為 <b>%s</b>%s`
+issues.change_title_at=`將標題從 <b><strike>%s</strike></b> 改為 <b>%s</b> %s`
 issues.delete_branch_at=`刪除分支 <b>%s</b> %s`
 issues.open_tab=%d 個開放中
 issues.close_tab=%d 個已關閉
@@ -1181,6 +1182,8 @@ pulls.is_closed=合併請求已被關閉。
 pulls.has_merged=合併請求已合併。
 pulls.title_wip_desc=`<a href="#">標題用 <strong>%s</strong> 開頭</a>以避免意外地合併此合併請求。`
 pulls.cannot_merge_work_in_progress=此合併請求被標記為仍在作業中。準備好要合併時請移除 <strong>%s</strong> 前綴。
+pulls.files_conflicted=此合併請求有變更和目標分支衝突。
+pulls.blocked_by_rejection=官方審核人員要求修改此合併請求。
 pulls.blocked_by_changed_protected_files_1=此合併請求被阻擋，因為修改到被保護的檔案：
 pulls.blocked_by_changed_protected_files_n=此合併請求被阻擋，因為修改到被保護的檔案：
 pulls.can_auto_merge_desc=這個合併請求可以自動合併。
@@ -1235,6 +1238,7 @@ milestones.filter_sort.most_complete=完成度由高到低
 milestones.filter_sort.most_issues=問題由多到少
 milestones.filter_sort.least_issues=問題由少到多
 
+signing.will_sign=將使用金鑰「%s」簽署此提交。
 signing.wont_sign.nokey=沒有金鑰可用來簽署此提交
 signing.wont_sign.not_signed_in=你還沒有登入
 
@@ -1303,7 +1307,7 @@ activity.new_issue_label=已開放
 activity.title.unresolved_conv_1=%d 未解決的對話
 activity.title.unresolved_conv_n=%d 未解決的對話
 activity.unresolved_conv_desc=這些最近更改的問題和合併請求尚未解決。
-activity.unresolved_conv_label=打開
+activity.unresolved_conv_label=開放
 activity.title.releases_1=%d 個版本
 activity.title.releases_n=%d 個版本
 activity.title.releases_published_by=%[2]s發佈了 %[1]s
@@ -1588,6 +1592,7 @@ settings.update_protect_branch_success='%s' 的分支保護已被更新
 settings.remove_protected_branch_success='%s' 的分支保護已被停用
 settings.protected_branch_deletion=停用分支保護
 settings.protected_branch_deletion_desc=停用分支保護將允許有寫入權限的使用者推送至該分支，是否繼續？
+settings.block_rejected_reviews_desc=如果官方審核人員提出變更請求，即使有足夠的核可也不允許進行合併。
 settings.default_branch_desc=請選擇一個用來提交程式碼和合併請求的預設分支。
 settings.choose_branch=選擇一個分支...
 settings.no_protected_branch=沒有受保護的分支。
@@ -1697,6 +1702,7 @@ branch.create_branch=建立分支 <strong>%s</strong>
 branch.create_from=從 '%s'
 branch.create_success=已建立分支 '%s'。
 branch.branch_already_exists=分支 '%s' 已存在此儲存庫
+branch.branch_name_conflict=分支名稱「%s」與現有分支「%s」衝突。
 branch.deleted_by=刪除人: %s
 branch.restore_failed=還原分支 %s 失敗
 branch.protected_deletion_failed=分支 '%s' 已被保護，不能刪除。
@@ -1828,7 +1834,7 @@ systemhooks=系統 Webhook
 authentication=認證來源
 emails=使用者電子信箱
 config=組態
-notices=系統提示管理
+notices=系統提示
 monitor=應用監控面版
 first_page=首頁
 last_page=末頁
@@ -2203,7 +2209,7 @@ monitor.queue.settings.changed=已更新設定
 monitor.queue.settings.blocktimeout.value=%[1]v
 
 
-notices.system_notice_list=系統提示管理
+notices.system_notice_list=系統提示
 notices.view_detail_header=查看提示細節
 notices.actions=操作
 notices.select_all=選取全部
@@ -2236,6 +2242,7 @@ push_tag=推送了標籤 <a href="%s/src/tag/%s">%[2]s</a> 到 <a href="%[1]s">%
 compare_branch=比較
 compare_commits=比較 %d 提交
 compare_commits_general=比較提交
+reject_pull_request=`建議變更 <a href="%s/pulls/%s">%s#%[2]s</a>`
 
 [tool]
 ago=%s前

routers/repo/http.go

@@ -576,7 +576,7 @@ func serviceRPC(h serviceHandler, service string) {
 	defer process.GetManager().Remove(pid)
 
 	if err := cmd.Run(); err != nil {
-		log.Error("Fail to serve RPC(%s): %v - %s", service, err, stderr.String())
+		log.Error("Fail to serve RPC(%s) in %s: %v - %s", service, h.dir, err, stderr.String())
 		return
 	}
 }

services/gitdiff/gitdiff.go

@@ -181,7 +181,7 @@ var (
 	removedCodePrefix = []byte(`<span class="removed-code">`)
 	codeTagSuffix     = []byte(`</span>`)
 )
-var addSpanRegex = regexp.MustCompile(`<span [class="[a-z]*]*$`)
+var addSpanRegex = regexp.MustCompile(`<span\s*[a-z="]*$`)
 
 func diffToHTML(fileName string, diffs []diffmatchpatch.Diff, lineType DiffLineType) template.HTML {
 	buf := bytes.NewBuffer(nil)
@@ -221,7 +221,7 @@ func diffToHTML(fileName string, diffs []diffmatchpatch.Diff, lineType DiffLineT
 				diffs[i].Text = strings.TrimSuffix(diffs[i].Text, addSpan)
 			}
 			buf.Write(addedCodePrefix)
-			buf.WriteString(getLineContent(diffs[i].Text))
+			buf.WriteString(diffs[i].Text)
 			buf.Write(codeTagSuffix)
 		case diffs[i].Type == diffmatchpatch.DiffDelete && lineType == DiffLineDel:
 			if len(addSpan) > 0 {
@@ -238,7 +238,7 @@ func diffToHTML(fileName string, diffs []diffmatchpatch.Diff, lineType DiffLineT
 				diffs[i].Text = strings.TrimSuffix(diffs[i].Text, addSpan)
 			}
 			buf.Write(removedCodePrefix)
-			buf.WriteString(getLineContent(diffs[i].Text))
+			buf.WriteString(diffs[i].Text)
 			buf.Write(codeTagSuffix)
 		}
 	}

services/gitdiff/gitdiff_test.go

@@ -74,6 +74,15 @@ func TestDiffToHTML(t *testing.T) {
 		{Type: dmp.DiffInsert, Text: "lass=\"p\">,</span> <span class=\"kc\">true</span><span class=\"p\">,</span> <span class=\"nx\">attrs"},
 		{Type: dmp.DiffEqual, Text: "</span><span class=\"p\">,</span> <span class=\"kc\">false</span><span class=\"p\">)</span>"},
 	}, DiffLineAdd))
+
+	assertEqual(t, "<span class=\"k\">print</span><span class=\"added-code\"></span><span class=\"added-code\"><span class=\"p\">(</span></span><span class=\"sa\"></span><span class=\"s2\">&#34;</span><span class=\"s2\">// </span><span class=\"s2\">&#34;</span><span class=\"p\">,</span> <span class=\"n\">sys</span><span class=\"o\">.</span><span class=\"n\">argv</span><span class=\"added-code\"><span class=\"p\">)</span></span>", diffToHTML("", []dmp.Diff{
+		{Type: dmp.DiffEqual, Text: "<span class=\"k\">print</span>"},
+		{Type: dmp.DiffInsert, Text: "<span"},
+		{Type: dmp.DiffEqual, Text: " "},
+		{Type: dmp.DiffInsert, Text: "class=\"p\">(</span>"},
+		{Type: dmp.DiffEqual, Text: "<span class=\"sa\"></span><span class=\"s2\">&#34;</span><span class=\"s2\">// </span><span class=\"s2\">&#34;</span><span class=\"p\">,</span> <span class=\"n\">sys</span><span class=\"o\">.</span><span class=\"n\">argv</span>"},
+		{Type: dmp.DiffInsert, Text: "<span class=\"p\">)</span>"},
+	}, DiffLineAdd))
 }
 
 func TestParsePatch_singlefile(t *testing.T) {

web_src/less/_repository.less

@@ -400,6 +400,13 @@
         background-color: #ffffee;
       }
 
+      tr.has-parent a {
+        display: inline-block;
+        padding-top: 8px;
+        padding-bottom: 8px;
+        width: calc(100% - 1.25rem);
+      }
+
       .jumpable-path {
         color: #888888;
       }