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 | |
| 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')
| -rw-r--r-- | templates/.VERSION | 2 | ||||
| -rw-r--r-- | templates/repo/issue/view_content.tmpl | 12 | ||||
| -rw-r--r-- | templates/repo/issue/view_title.tmpl | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/templates/.VERSION b/templates/.VERSION index d381c8cafc..3aa00ff9dc 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.9.81.0816
\ No newline at end of file +0.9.82.0816
\ No newline at end of file diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index ebd737c381..3911059141 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -151,15 +151,15 @@ {{if .Issue.IsPull}} <div class="comment merge box"> <a class="avatar text - {{if .Issue.HasMerged}}purple + {{if .Issue.PullRequest.HasMerged}}purple {{else if .Issue.IsClosed}}grey {{else if .IsPullReuqestBroken}}red - {{else if .Issue.IsChecking}}yellow - {{else if .Issue.CanAutoMerge}}green + {{else if .Issue.PullRequest.IsChecking}}yellow + {{else if .Issue.PullRequest.CanAutoMerge}}green {{else}}red{{end}}"><span class="mega-octicon octicon-git-merge"></span></a> <div class="content"> <div class="ui merge segment"> - {{if .Issue.HasMerged}} + {{if .Issue.PullRequest.HasMerged}} <div class="item text purple"> {{$.i18n.Tr "repo.pulls.has_merged"}} </div> @@ -172,12 +172,12 @@ <span class="octicon octicon-x"></span> {{$.i18n.Tr "repo.pulls.data_broken"}} </div> - {{else if .Issue.IsChecking}} + {{else if .Issue.PullRequest.IsChecking}} <div class="item text yellow"> <span class="octicon octicon-sync"></span> {{$.i18n.Tr "repo.pulls.is_checking"}} </div> - {{else if .Issue.CanAutoMerge}} + {{else if .Issue.PullRequest.CanAutoMerge}} <div class="item text green"> <span class="octicon octicon-check"></span> {{$.i18n.Tr "repo.pulls.can_auto_merge_desc"}} 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> |