diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2017-10-25 13:26:14 +0800 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2017-10-25 13:26:14 +0800 |
| commit | 219ca5cadbc9b56d47068becbc990298592bf4ee (patch) | |
| tree | 4bf41a189abf45661613ac281d8a0156e9036a85 /templates/repo/issue | |
| parent | 796be03e9b62154c9432622b8b4dbcef86a72a94 (diff) | |
| download | gitea-219ca5cadbc9b56d47068becbc990298592bf4ee.tar.gz gitea-219ca5cadbc9b56d47068becbc990298592bf4ee.zip | |
some fixes
Diffstat (limited to 'templates/repo/issue')
| -rw-r--r-- | templates/repo/issue/view_title.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index 3f3b62e653..4650ba4c80 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -28,7 +28,7 @@ {{if .Issue.PullRequest.HasMerged}} {{ $mergedStr:= TimeSince .Issue.PullRequest.Merged $.Lang }} <a {{if gt .Issue.PullRequest.Merger.ID 0}}href="{{.Issue.PullRequest.Merger.HomeLink}}"{{end}}>{{.Issue.PullRequest.Merger.Name}}</a> - <span class="pull-desc">{{$.i18n.Tr "repo.pulls.merged_title_desc" .NumCommits .HeadTarget .BaseTarget $mergedStr | Safe}}</span> + <span class="pull-desc">{{$.i18n.Tr "repo.pulls.merged_title_desc" .NumCommits .HeadTarget .BaseTarget $mergedStr | Str2html}}</span> {{else}} <a {{if gt .Issue.Poster.ID 0}}href="{{.Issue.Poster.HomeLink}}"{{end}}>{{.Issue.Poster.Name}}</a> <span class="pull-desc">{{$.i18n.Tr "repo.pulls.title_desc" .NumCommits .HeadTarget .BaseTarget | Str2html}}</span> |