Use OldRef instead of CommitSHA for DeleteBranch comments (#14604)

Fix #14545

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
zeripath 2021-02-08 03:09:14 +00:00 committed by GitHub
parent 98827e99f6
commit 378acc9d96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 6 deletions

View file

@ -745,11 +745,11 @@ func AddDeletePRBranchComment(doer *User, repo *Repository, issueID int64, branc
return err return err
} }
var opts = &CreateCommentOptions{ var opts = &CreateCommentOptions{
Type: CommentTypeDeleteBranch, Type: CommentTypeDeleteBranch,
Doer: doer, Doer: doer,
Repo: repo, Repo: repo,
Issue: issue, Issue: issue,
CommitSHA: branchName, OldRef: branchName,
} }
if _, err = createComment(sess, opts); err != nil { if _, err = createComment(sess, opts); err != nil {
return err return err

View file

@ -284,6 +284,8 @@ var migrations = []Migration{
NewMigration("Add user redirect", addUserRedirect), NewMigration("Add user redirect", addUserRedirect),
// v168 -> v169 // v168 -> v169
NewMigration("Recreate user table to fix default values", recreateUserTableToFixDefaultValues), NewMigration("Recreate user table to fix default values", recreateUserTableToFixDefaultValues),
// v169 -> v170
NewMigration("Update DeleteBranch comments to set the old_ref to the commit_sha", commentTypeDeleteBranchUseOldRef),
} }
// GetCurrentDBVersion returns the current db version // GetCurrentDBVersion returns the current db version

14
models/migrations/v169.go Normal file
View file

@ -0,0 +1,14 @@
// Copyright 2021 The Gitea Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package migrations
import (
"xorm.io/xorm"
)
func commentTypeDeleteBranchUseOldRef(x *xorm.Engine) error {
_, err := x.Exec("UPDATE comment SET old_ref = commit_sha, commit_sha = '' WHERE type = 11")
return err
}

View file

@ -251,7 +251,7 @@
</a> </a>
<span class="text grey"> <span class="text grey">
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a> <a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
{{$.i18n.Tr "repo.issues.delete_branch_at" (.CommitSHA|Escape) $createdStr | Safe}} {{$.i18n.Tr "repo.issues.delete_branch_at" (.OldRef|Escape) $createdStr | Safe}}
</span> </span>
</div> </div>
{{else if eq .Type 12}} {{else if eq .Type 12}}