diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 2109950ca..1d1a0f588 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1470,6 +1470,7 @@ issues.error_removing_due_date = "Failed to remove the due date." issues.push_commit_1 = "added %d commit %s" issues.push_commits_n = "added %d commits %s" issues.force_push_codes = `force-pushed %[1]s from %[2]s to %[4]s %[6]s` +issues.force_push_compare = Compare issues.due_date_form = "yyyy-mm-dd" issues.due_date_form_add = "Add due date" issues.due_date_form_edit = "Edit" diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 94b46bd9f..d2a4af941 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -707,6 +707,11 @@ {{$.locale.TrN (len .Commits) "repo.issues.push_commit_1" "repo.issues.push_commits_n" (len .Commits) $createdStr | Safe}} {{end}} + {{if and .IsForcePush $.Issue.PullRequest.BaseRepo.Name}} + + {{$.locale.Tr "repo.issues.force_push_compare"}} + + {{end}} {{if not .IsForcePush}} {{template "repo/commits_list_small" dict "comment" . "root" $}} diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index a8106c5bf..abbacfb53 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -952,6 +952,17 @@ margin-top: 4px; } + .comparebox { + line-height: 32px; + vertical-align: middle; + + .compare.label { + font-size: 1rem; + margin: 0; + border: 1px solid var(--color-light-border); + } + } + .comment-form-reply .footer { padding-bottom: 1em; }