Merge branch 'main' into main

Author: 6543

models/issue.go

@@ -804,7 +804,7 @@ func (issue *Issue) ChangeContent(doer *User, content string) (err error) {
 		return fmt.Errorf("UpdateIssueCols: %v", err)
 	}
 
-	if err = issues.SaveIssueContentHistory(db.GetEngine(ctx), issue.PosterID, issue.ID, 0,
+	if err = issues.SaveIssueContentHistory(db.GetEngine(ctx), doer.ID, issue.ID, 0,
 		timeutil.TimeStampNow(), issue.Content, false); err != nil {
 		return fmt.Errorf("SaveIssueContentHistory: %v", err)
 	}
@@ -979,7 +979,7 @@ func newIssue(e db.Engine, doer *User, opts NewIssueOptions) (err error) {
 		return err
 	}
 
-	if err = issues.SaveIssueContentHistory(e, opts.Issue.PosterID, opts.Issue.ID, 0,
+	if err = issues.SaveIssueContentHistory(e, doer.ID, opts.Issue.ID, 0,
 		timeutil.TimeStampNow(), opts.Issue.Content, true); err != nil {
 		return err
 	}

models/issue_test.go

@@ -357,6 +357,7 @@ func testInsertIssue(t *testing.T, title, content string, expectIndex int64) *Is
 		issue := Issue{
 			RepoID:   repo.ID,
 			PosterID: user.ID,
+			Poster:   user,
 			Title:    title,
 			Content:  content,
 		}

modules/markup/html.go

@@ -94,7 +94,7 @@ var issueFullPatternOnce sync.Once
 func getIssueFullPattern() *regexp.Regexp {
 	issueFullPatternOnce.Do(func() {
 		issueFullPattern = regexp.MustCompile(regexp.QuoteMeta(setting.AppURL) +
-			`\w+/\w+/(?:issues|pulls)/((?:\w{1,10}-)?[1-9][0-9]*)([\?|#]\S+.(\S+)?)?\b`)
+			`\w+/\w+/(?:issues|pulls)/((?:\w{1,10}-)?[1-9][0-9]*)([\?|#](\S+)?)?\b`)
 	})
 	return issueFullPattern
 }

modules/markup/html_internal_test.go

@@ -265,6 +265,10 @@ func TestRender_FullIssueURLs(t *testing.T) {
 		`<a href="http://localhost:3000/person/repo/issues/4#issuecomment-1234" class="ref-issue">person/repo#4</a>`)
 	test("http://localhost:3000/gogits/gogs/issues/4",
 		`<a href="http://localhost:3000/gogits/gogs/issues/4" class="ref-issue">#4</a>`)
+	test("http://localhost:3000/gogits/gogs/issues/4 test",
+		`<a href="http://localhost:3000/gogits/gogs/issues/4" class="ref-issue">#4</a> test`)
+	test("http://localhost:3000/gogits/gogs/issues/4?a=1&b=2#comment-123 test",
+		`<a href="http://localhost:3000/gogits/gogs/issues/4?a=1&amp;b=2#comment-123" class="ref-issue">#4</a> test`)
 }
 
 func TestRegExp_sha1CurrentPattern(t *testing.T) {

options/locale/locale_zh-TW.ini

@@ -520,7 +520,7 @@ change_username=您的帳號已更改。
 change_username_prompt=注意：修改帳號也會更改您的帳戶的 URL。
 change_username_redirect_prompt=舊的帳號被領用前，會重新導向您的新帳號。
 continue=繼續操作
-cancel=取消操作
+cancel=取消
 language=語言
 ui=佈景主題
 privacy=隱私
@@ -926,6 +926,9 @@ star_guest_user=登入以為此儲存庫加上星號。
 copy_link=複製連結
 copy_link_success=已複製連結
 copy_link_error=請按下 ⌘-C 或 Ctrl-C 複製
+copy_branch=複製
+copy_branch_success=已複製分支名稱
+copy_branch_error=按下 ⌘C 或 Ctrl-C 以複製
 copied=複製成功
 unwatch=取消關注
 watch=關注
@@ -980,6 +983,7 @@ commit_graph=提交線圖
 commit_graph.select=選擇分支
 commit_graph.hide_pr_refs=隱藏合併請求
 commit_graph.monochrome=單色
+commit_graph.color=彩色
 blame=Blame
 normal_view=標準檢視
 line=行
@@ -1096,6 +1100,7 @@ projects.board.set_default=設為預設
 projects.board.set_default_desc=將此看板設定為未分類問題及合併請求的預設看板
 projects.board.delete=刪除看板
 projects.board.deletion_desc=刪除專案看板會將所有相關的問題移動到「未分類」，是否繼續？
+projects.board.color=顏色
 projects.open=開啟
 projects.close=關閉
 
@@ -1799,6 +1804,7 @@ settings.content_type=POST Content Type
 settings.secret=Secret
 settings.slack_username=服務名稱
 settings.slack_icon_url=圖標 URL
+settings.slack_color=顏色
 settings.discord_username=使用者名稱
 settings.discord_icon_url=Icon URL
 settings.event_desc=觸發條件：

routers/web/repo/issue_content_history.go

@@ -88,12 +88,13 @@ func canSoftDeleteContentHistory(ctx *context.Context, issue *models.Issue, comm
 	if ctx.Repo.IsOwner() {
 		canSoftDelete = true
 	} else if ctx.Repo.CanWrite(models.UnitTypeIssues) {
-		canSoftDelete = ctx.User.ID == history.PosterID
 		if comment == nil {
-			canSoftDelete = canSoftDelete && (ctx.User.ID == issue.PosterID)
+			// the issue poster or the history poster can soft-delete
+			canSoftDelete = ctx.User.ID == issue.PosterID || ctx.User.ID == history.PosterID
 			canSoftDelete = canSoftDelete && (history.IssueID == issue.ID)
 		} else {
-			canSoftDelete = canSoftDelete && (ctx.User.ID == comment.PosterID)
+			// the comment poster or the history poster can soft-delete
+			canSoftDelete = ctx.User.ID == comment.PosterID || ctx.User.ID == history.PosterID
 			canSoftDelete = canSoftDelete && (history.IssueID == issue.ID)
 			canSoftDelete = canSoftDelete && (history.CommentID == comment.ID)
 		}
@@ -137,7 +138,8 @@ func GetContentHistoryDetail(ctx *context.Context) {
 
 	// compare the current history revision with the previous one
 	dmp := diffmatchpatch.New()
-	diff := dmp.DiffMain(prevHistoryContentText, history.ContentText, true)
+	// `checklines=false` makes better diff result
+	diff := dmp.DiffMain(prevHistoryContentText, history.ContentText, false)
 	diff = dmp.DiffCleanupEfficiency(diff)
 
 	// use chroma to render the diff html

web_src/js/features/issue-content-history.js

@@ -12,7 +12,7 @@ function showContentHistoryDetail(issueBaseUrl, commentId, historyId, itemTitleH
   if ($dialog.length) return;
 
   $dialog = $(`
-<div class="ui modal content-history-detail-dialog" style="min-height: 50%;">
+<div class="ui modal content-history-detail-dialog">
   <i class="close icon inside"></i>
   <div class="header">
     ${itemTitleHtml}
@@ -24,7 +24,7 @@ function showContentHistoryDetail(issueBaseUrl, commentId, historyId, itemTitleH
     </div>
   </div>
   <!-- ".modal .content" style was polluted in "_base.less": "&.modal > .content"  -->
-  <div class="scrolling content" style="text-align: left;">
+  <div class="scrolling content" style="text-align: left; min-height: 30vh;">
       <div class="ui loader active"></div>
   </div>
 </div>`);

web_src/less/markup/content.less

@@ -158,9 +158,12 @@
 
   .task-list-item {
     list-style-type: none;
+    position: relative;
 
     input[type="checkbox"] {
-      margin: 0 6px .25em -1.6em;
+      position: absolute;
+      top: .25em;
+      left: -1.6em;
     }
   }