1
1
mirror of https://github.com/go-gitea/gitea synced 2025-12-07 13:28:25 +00:00

Some improvements

This commit is contained in:
Lunny Xiao
2024-08-21 19:40:32 -07:00
parent 2361ec5a44
commit b4eac75dba
4 changed files with 15 additions and 9 deletions
@@ -11,13 +11,17 @@
</a>
</span>
<div>
Created {{DateTime "short" .PullRequest.Issue.CreatedUnix}}
{{ctx.Locale.Tr "repo.issues.link.created" (DateTime "short" .PullRequest.Issue.CreatedUnix)}}
{{if .PullRequest.HasMerged}}
Completed
{{.PullRequest.MergedCommitID}}
Created {{.PullRequest.MergedUnix}}
{{ctx.Locale.Tr "repo.issues.pr.completed"}}
</div>
<div>
{{svg "octicon-git-commit" 14}} <a href="{{.PullRequest.BaseRepo.Link}}/src/commit/{{.PullRequest.MergedCommitID}}">{{.PullRequest.MergedCommitID | ShortSha}}</a>
</div>
<div>
{{ctx.Locale.Tr "repo.issues.link.created" (DateTime "short" .PullRequest.MergedUnix)}}
{{else if .PullRequest.ChangedProtectedFiles}}
Merge conflicts
{{ctx.Locale.Tr "repo.issues.pr.conflicted"}}
{{end}}
</div>
{{else if and .Branch .DisplayBranch}}