|
|
@ -7,7 +7,7 @@
|
|
|
|
13 = STOP_TRACKING, 14 = ADD_TIME_MANUAL, 16 = ADDED_DEADLINE, 17 = MODIFIED_DEADLINE,
|
|
|
|
13 = STOP_TRACKING, 14 = ADD_TIME_MANUAL, 16 = ADDED_DEADLINE, 17 = MODIFIED_DEADLINE,
|
|
|
|
18 = REMOVED_DEADLINE, 19 = ADD_DEPENDENCY, 20 = REMOVE_DEPENDENCY, 21 = CODE,
|
|
|
|
18 = REMOVED_DEADLINE, 19 = ADD_DEPENDENCY, 20 = REMOVE_DEPENDENCY, 21 = CODE,
|
|
|
|
22 = REVIEW, 23 = ISSUE_LOCKED, 24 = ISSUE_UNLOCKED, 25 = TARGET_BRANCH_CHANGED,
|
|
|
|
22 = REVIEW, 23 = ISSUE_LOCKED, 24 = ISSUE_UNLOCKED, 25 = TARGET_BRANCH_CHANGED,
|
|
|
|
26 = DELETE_TIME_MANUAL, 27 = REVIEW_REQUEST -->
|
|
|
|
26 = DELETE_TIME_MANUAL, 27 = REVIEW_REQUEST, 28 = MERGE_PULL_REQUEST -->
|
|
|
|
{{if eq .Type 0}}
|
|
|
|
{{if eq .Type 0}}
|
|
|
|
<div class="timeline-item comment" id="{{.HashTag}}">
|
|
|
|
<div class="timeline-item comment" id="{{.HashTag}}">
|
|
|
|
{{if .OriginalAuthor }}
|
|
|
|
{{if .OriginalAuthor }}
|
|
|
@ -84,6 +84,18 @@
|
|
|
|
</a>
|
|
|
|
</a>
|
|
|
|
<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a> {{$.i18n.Tr "repo.issues.closed_at" .EventTag $createdStr | Safe}}</span>
|
|
|
|
<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a> {{$.i18n.Tr "repo.issues.closed_at" .EventTag $createdStr | Safe}}</span>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
{{else if eq .Type 28}}
|
|
|
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
|
|
|
|
|
|
|
<span class="badge purple">{{svg "octicon-git-merge" 16}}</span>
|
|
|
|
|
|
|
|
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
|
|
|
|
|
|
|
|
<img src="{{.Poster.RelAvatarLink}}">
|
|
|
|
|
|
|
|
</a>
|
|
|
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
|
|
|
<a href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
|
|
|
{{$link := printf "%s/commit/%s" $.Repository.HTMLURL $.Issue.PullRequest.MergedCommitID}}
|
|
|
|
|
|
|
|
{{$.i18n.Tr "repo.issues.pull_merged_at" $link (ShortSha $.Issue.PullRequest.MergedCommitID) $.BaseTarget $createdStr | Str2html}}
|
|
|
|
|
|
|
|
</span>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
{{else if eq .Type 3 5 6}}
|
|
|
|
{{else if eq .Type 3 5 6}}
|
|
|
|
{{ $refFrom:= "" }}
|
|
|
|
{{ $refFrom:= "" }}
|
|
|
|
{{if ne .RefRepoID .Issue.RepoID}}
|
|
|
|
{{if ne .RefRepoID .Issue.RepoID}}
|
|
|
|