diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index aa833a4a8f..64079ab787 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -1,27 +1,28 @@ -

-
- {{if or .PageIsCommits (gt .CommitCount 0)}} - {{ctx.Locale.TrN .CommitCount "repo.n_commit_one" "repo.n_commit_few" (ctx.Locale.PrettyNumber .CommitCount)}} - {{else if .IsNothingToCompare}} - {{ctx.Locale.Tr "repo.commits.nothing_to_compare"}} - {{else}} - {{ctx.Locale.Tr "repo.commits.no_commits" $.BaseBranch $.HeadBranch}} - {{end}} -
- {{if .IsDiffCompare}} -
- - {{if not .BaseIsCommit}}{{if .BaseIsBranch}}{{svg "octicon-git-branch"}}{{else if .BaseIsTag}}{{svg "octicon-tag"}}{{end}}{{.BaseBranch}}{{else}}{{ShortSha .BaseBranch}}{{end}} - - ... - - {{if not .HeadIsCommit}}{{if .HeadIsBranch}}{{svg "octicon-git-branch"}}{{else if .HeadIsTag}}{{svg "octicon-tag"}}{{end}}{{.HeadBranch}}{{else}}{{ShortSha .HeadBranch}}{{end}} - +{{if.PageIsPullCommits}} +

+
+ {{if or .PageIsCommits (gt .CommitCount 0)}} + {{ctx.Locale.TrN .CommitCount "repo.n_commit_one" "repo.n_commit_few" (StringUtils.ToString .CommitCount)}} + {{else if .IsNothingToCompare}} + {{ctx.Locale.Tr "repo.commits.nothing_to_compare"}} + {{else}} + {{ctx.Locale.Tr "repo.commits.no_commits" $.BaseBranch $.HeadBranch}} + {{end}}
- {{end}} -

+ {{if .IsDiffCompare}} + + {{end}} +

-{{if .PageIsCommits}} +{{else if .PageIsCommits}}

{{if or .PageIsCommits (gt .CommitCount 0)}} diff --git a/templates/repo/pulls/commits_list.tmpl b/templates/repo/pulls/commits_list.tmpl index bcbd7daa63..38b4ac99a3 100644 --- a/templates/repo/pulls/commits_list.tmpl +++ b/templates/repo/pulls/commits_list.tmpl @@ -15,7 +15,7 @@
{{end}} -
+
{{$userName := .Author.Name}} @@ -32,7 +32,7 @@
- {{$commitLink:= printf "%s/pulls/%d/commits/%s" $commitRepoLink (PathEscape .ID.String)}} + {{$commitLink := (printf "%s/pulls/%d/commits/%s" $commitRepoLink $.Issue.Index (PathEscape .ID.String))}}
{{RenderCommitMessageLinkSubject $.Context .Message $commitLink ($.Repository.ComposeMetas ctx)}} {{if IsMultilineCommitMessage .Message}} @@ -73,14 +73,11 @@
-