update delete box as well

Author: silverwind

options/locale/locale_en-US.ini

@@ -1621,11 +1621,11 @@ pulls.tab_files = Files Changed
 pulls.reopen_to_merge = Please reopen this pull request to perform a merge.
 pulls.cant_reopen_deleted_branch = This pull request cannot be reopened because the branch was deleted.
 pulls.merged = Merged
-pulls.merged_as = Pull request successfully merged and closed
+pulls.merged_success = Pull request successfully merged and closed
+pulls.closed = Pull request closed
 pulls.manually_merged = Manually merged
 pulls.merged_info_text = The branch %s can now be deleted.
 pulls.is_closed = The pull request has been closed.
-pulls.has_merged = The pull request has been merged.
 pulls.title_wip_desc = `<a href="#">Start the title with <strong>%s</strong></a> to prevent the pull request from being merged accidentally.`
 pulls.cannot_merge_work_in_progress = This pull request is marked as a work in progress.
 pulls.still_in_progress = Still in progress?

templates/repo/issue/view_content/pull.tmpl

@@ -133,15 +133,10 @@
 			{{if .Issue.PullRequest.HasMerged}}
 				<div class="item item-section text gt-f1">
 					<div class="item-section-left">
-						{{if .Issue.PullRequest.MergedCommitID}}
-							{{$link := printf "%s/commit/%s" $.Repository.Link (.Issue.PullRequest.MergedCommitID|PathEscape)}}
-							<h3>{{$.locale.Tr "repo.pulls.merged_as"}}</h3>
-							<div class="merge-section-info">
-								{{$.locale.Tr "repo.pulls.merged_info_text" (printf "<code>%s</code>" .HeadTarget) | Str2html}}
-							</div>
-						{{else}}
-							{{$.locale.Tr "repo.pulls.has_merged"}}
-						{{end}}
+						<h3 class="gt-mb-3">{{$.locale.Tr "repo.pulls.merged_success"}}</h3>
+						<div class="merge-section-info">
+							{{$.locale.Tr "repo.pulls.merged_info_text" (printf "<code>%s</code>" .HeadTarget) | Str2html}}
+						</div>
 					</div>
 					{{if .IsPullBranchDeletable}}
 						<div class="item-section-right">
@@ -152,11 +147,14 @@
 			{{else if .Issue.IsClosed}}
 				<div class="item item-section text gt-f1">
 					<div class="item-section-left">
-						{{if .IsPullRequestBroken}}
-							{{$.locale.Tr "repo.pulls.cant_reopen_deleted_branch"}}
-						{{else}}
-							{{$.locale.Tr "repo.pulls.reopen_to_merge"}}
-						{{end}}
+						<h3 class="gt-mb-3">{{$.locale.Tr "repo.pulls.closed"}}</h3>
+						<div class="merge-section-info">
+							{{if .IsPullRequestBroken}}
+								{{$.locale.Tr "repo.pulls.cant_reopen_deleted_branch"}}
+							{{else}}
+								{{$.locale.Tr "repo.pulls.reopen_to_merge"}}
+							{{end}}
+						</div>
 					</div>
 					{{if and .IsPullBranchDeletable (not .IsPullRequestBroken)}}
 						<div class="item-section-right">