aboutsummaryrefslogtreecommitdiffstats
path: root/templates/shared
diff options
context:
space:
mode:
authorwxiaoguang <wxiaoguang@gmail.com>2025-01-17 16:55:02 +0800
committerGitHub <noreply@github.com>2025-01-17 08:55:02 +0000
commit3b839f8dc0ffc548819a0d7b7caba469cc9162c6 (patch)
treef5689a3b12006d60d5af4f323359a4d3dc16d714 /templates/shared
parent7582eb0419cda6dbd6b4bc1326a7e8d1533ecb6b (diff)
downloadgitea-3b839f8dc0ffc548819a0d7b7caba469cc9162c6.tar.gz
gitea-3b839f8dc0ffc548819a0d7b7caba469cc9162c6.zip
Trivial fixes (#33304)
1. the error check was added for go-git, it was caused by the empty `.keep` file in the test fixtures. 2. use `PostFormValue` instead of `PostForm.Get` (`Get` needs to parse the form ahead) 3. fix incorrect container text (it should show "Images" in the header but not "OS/Arch") 4. align maven xml 5. fix closed PR color&icon
Diffstat (limited to 'templates/shared')
-rw-r--r--templates/shared/issueicon.tmpl3
1 files changed, 2 insertions, 1 deletions
diff --git a/templates/shared/issueicon.tmpl b/templates/shared/issueicon.tmpl
index f828de5c66..bb6247c708 100644
--- a/templates/shared/issueicon.tmpl
+++ b/templates/shared/issueicon.tmpl
@@ -1,3 +1,4 @@
+{{/* the logic should be kept the same as getIssueIcon/getIssueColor in JS code */}}
{{- if .IsPull -}}
{{- if not .PullRequest -}}
No PullRequest
@@ -6,7 +7,7 @@
{{- if .PullRequest.HasMerged -}}
{{- svg "octicon-git-merge" 16 "text purple" -}}
{{- else -}}
- {{- svg "octicon-git-pull-request" 16 "text red" -}}
+ {{- svg "octicon-git-pull-request-closed" 16 "text red" -}}
{{- end -}}
{{- else -}}
{{- if .PullRequest.IsWorkInProgress ctx -}}