diff options
| author | Justin Nuß <justin.nuss@hmmh.de> | 2014-07-24 12:29:37 +0200 |
|---|---|---|
| committer | Justin Nuß <justin.nuss@hmmh.de> | 2014-07-24 12:29:37 +0200 |
| commit | 967856f36ebd2d6216ceb2299b5399f7d25e86e9 (patch) | |
| tree | bfde3326df1efcda39927bea2b44e9dcc0d436e5 /templates/repo/issue/view.tmpl | |
| parent | 3c025b395077292a721419942f997311ef575fd9 (diff) | |
| parent | a76a948a029f46697a0e2327ea6ca86872a760d7 (diff) | |
| download | gitea-967856f36ebd2d6216ceb2299b5399f7d25e86e9.tar.gz gitea-967856f36ebd2d6216ceb2299b5399f7d25e86e9.zip | |
Merge branch 'dev' into feature/attachments
Conflicts:
models/issue.go
routers/repo/issue.go
Diffstat (limited to 'templates/repo/issue/view.tmpl')
| -rw-r--r-- | templates/repo/issue/view.tmpl | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/templates/repo/issue/view.tmpl b/templates/repo/issue/view.tmpl index 8bcfe6b971..55f788bdba 100644 --- a/templates/repo/issue/view.tmpl +++ b/templates/repo/issue/view.tmpl @@ -54,6 +54,7 @@ </div> </div> {{range .Comments}} + {{/* 0 = COMMENT, 1 = REOPEN, 2 = CLOSE, 3 = ISSUE, 4 = COMMIT, 5 = PULL */}} {{if eq .Type 0}} <div class="issue-child" id="issue-comment-{{.Id}}"> <a class="user pull-left" href="/user/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a> @@ -88,6 +89,17 @@ <a class="user pull-left" href="/user/{{.Poster.Name}}">{{.Poster.Name}}</a> <span class="label label-danger">Closed</span> this issue <span class="time">{{TimeSince .Created}}</span> </div> </div> + {{else if eq .Type 4}} + <div class="issue-child issue-reference issue-reference-commit"> + <a class="user pull-left" href="/user/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a> + <div class="issue-content"> + <a class="user pull-left" href="/user/{{.Poster.Name}}">{{.Poster.Name}}</a> <span class="label label-primary">Referenced</span> this issue <span class="time">{{TimeSince .Created}}</span> + <p> + <a class="user pull-left" href="/user/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a> + {{.ContentHtml}} + </p> + </div> + </div> {{end}} {{end}} <hr class="issue-line"/> |