Merge branch 'main' into refactor-sanitize

Author: wxiaoguang

models/issue.go

@@ -753,6 +753,24 @@ func (issue *Issue) ChangeRef(doer *User, oldRef string) (err error) {
 		return fmt.Errorf("updateIssueCols: %v", err)
 	}
 
+	if err = issue.loadRepo(db.GetEngine(ctx)); err != nil {
+		return fmt.Errorf("loadRepo: %v", err)
+	}
+	oldRefFriendly := strings.TrimPrefix(oldRef, "refs/heads/")
+	newRefFriendly := strings.TrimPrefix(issue.Ref, "refs/heads/")
+
+	opts := &CreateCommentOptions{
+		Type:   CommentTypeChangeIssueRef,
+		Doer:   doer,
+		Repo:   issue.Repo,
+		Issue:  issue,
+		OldRef: oldRefFriendly,
+		NewRef: newRefFriendly,
+	}
+	if _, err = createComment(db.GetEngine(ctx), opts); err != nil {
+		return fmt.Errorf("createComment: %v", err)
+	}
+
 	return committer.Commit()
 }
 

models/issue_comment.go

@@ -101,8 +101,10 @@ const (
 	CommentTypeProject
 	// 31 Project board changed
 	CommentTypeProjectBoard
-	// Dismiss Review
+	// 32 Dismiss Review
 	CommentTypeDismissReview
+	// 33 Change issue ref
+	CommentTypeChangeIssueRef
 )
 
 // RoleDescriptor defines comment tag type

options/locale/locale_en-US.ini

@@ -1173,6 +1173,9 @@ issues.add_assignee_at = `was assigned by <b>%s</b> %s`
 issues.remove_assignee_at = `was unassigned by <b>%s</b> %s`
 issues.remove_self_assignment = `removed their assignment %s`
 issues.change_title_at = `changed title from <b><strike>%s</strike></b> to <b>%s</b> %s`
+issues.change_ref_at = `changed reference from <b><strike>%s</strike></b> to <b>%s</b> %s`
+issues.remove_ref_at = `removed reference <b>%s</b> %s`
+issues.add_ref_at = `added reference <b>%s</b> %s`
 issues.delete_branch_at = `deleted branch <b>%s</b> %s`
 issues.open_tab = %d Open
 issues.close_tab = %d Closed

routers/web/repo/compare.go

@@ -433,7 +433,7 @@ func ParseCompareInfo(ctx *context.Context) *CompareInfo {
 		if canRead {
 			ctx.Data["RootRepo"] = rootRepo
 			if !fileOnly {
-				branches, tags, err := getBranchesAndTagsForRepo(ctx.User, rootRepo)
+				branches, tags, err := getBranchesAndTagsForRepo(rootRepo)
 				if err != nil {
 					ctx.ServerError("GetBranchesForRepo", err)
 					return nil
@@ -458,7 +458,7 @@ func ParseCompareInfo(ctx *context.Context) *CompareInfo {
 		if canRead {
 			ctx.Data["OwnForkRepo"] = ownForkRepo
 			if !fileOnly {
-				branches, tags, err := getBranchesAndTagsForRepo(ctx.User, ownForkRepo)
+				branches, tags, err := getBranchesAndTagsForRepo(ownForkRepo)
 				if err != nil {
 					ctx.ServerError("GetBranchesForRepo", err)
 					return nil
@@ -630,7 +630,7 @@ func PrepareCompareDiff(
 	return false
 }
 
-func getBranchesAndTagsForRepo(user *models.User, repo *models.Repository) (branches, tags []string, err error) {
+func getBranchesAndTagsForRepo(repo *models.Repository) (branches, tags []string, err error) {
 	gitRepo, err := git.OpenRepository(repo.RepoPath())
 	if err != nil {
 		return nil, nil, err

templates/repo/issue/view_content/comments.tmpl

@@ -781,5 +781,22 @@
 				</div>
 			{{end}}
 		</div>
+	{{else if eq .Type 33}}
+		<div class="timeline-item event" id="{{.HashTag}}">
+			<span class="badge">{{svg "octicon-git-branch"}}</span>
+			<a href="{{.Poster.HomeLink}}">
+				{{avatar .Poster}}
+			</a>
+			<span class="text grey">
+				<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
+				{{if and .OldRef .NewRef}}
+					{{$.i18n.Tr "repo.issues.change_ref_at" (.OldRef|Escape) (.NewRef|Escape) $createdStr | Safe}}
+				{{else if .OldRef}}
+					{{$.i18n.Tr "repo.issues.remove_ref_at" (.OldRef|Escape) $createdStr | Safe}}
+				{{else}}
+					{{$.i18n.Tr "repo.issues.add_ref_at" (.NewRef|Escape) $createdStr | Safe}}
+				{{end}}
+			</span>
+		</div>
 	{{end}}
 {{end}}