diff options
| author | Unknwon <u@gogs.io> | 2016-08-16 10:19:09 -0700 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2016-08-16 10:19:09 -0700 |
| commit | 6f9a95f83020e215ebe3942bd541da34791dd043 (patch) | |
| tree | 9d95bc94e2346c808863377f79708d32decb8908 /templates/repo/issue/view_title.tmpl | |
| parent | 8bf57be9ba82d7b5289c894c902b5ecaaa1142bf (diff) | |
| download | gitea-6f9a95f83020e215ebe3942bd541da34791dd043.tar.gz gitea-6f9a95f83020e215ebe3942bd541da34791dd043.zip | |
#2246 add HTMLURL to webhook type
- Fill Milestone and Assignee field when available in webhook payload
Diffstat (limited to 'templates/repo/issue/view_title.tmpl')
| -rw-r--r-- | templates/repo/issue/view_title.tmpl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index e7c50d1d6a..3f3b62e653 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -25,9 +25,9 @@ {{end}} {{if .Issue.IsPull}} - {{if .Issue.HasMerged}} - {{ $mergedStr:= TimeSince .Issue.Merged $.Lang }} - <a {{if gt .Issue.Merger.ID 0}}href="{{.Issue.Merger.HomeLink}}"{{end}}>{{.Issue.Merger.Name}}</a> + {{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> {{else}} <a {{if gt .Issue.Poster.ID 0}}href="{{.Issue.Poster.HomeLink}}"{{end}}>{{.Issue.Poster.Name}}</a> |