2019-02-05 04:38:11 -07:00
|
|
|
{{ template "base/alert" }}
|
2017-03-16 23:57:43 -06:00
|
|
|
{{range .Issue.Comments}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{if call $.ShouldShowCommentType .Type}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{ $createdStr:= TimeSinceUnix .CreatedUnix $.locale }}
|
2017-03-16 23:57:43 -06:00
|
|
|
|
2022-01-21 10:59:26 -07:00
|
|
|
<!-- 0 = COMMENT, 1 = REOPEN, 2 = CLOSE, 3 = ISSUE_REF, 4 = COMMIT_REF,
|
|
|
|
|
5 = COMMENT_REF, 6 = PULL_REF, 7 = COMMENT_LABEL, 12 = START_TRACKING,
|
|
|
|
|
13 = STOP_TRACKING, 14 = ADD_TIME_MANUAL, 16 = ADDED_DEADLINE, 17 = MODIFIED_DEADLINE,
|
|
|
|
|
18 = REMOVED_DEADLINE, 19 = ADD_DEPENDENCY, 20 = REMOVE_DEPENDENCY, 21 = CODE,
|
|
|
|
|
22 = REVIEW, 23 = ISSUE_LOCKED, 24 = ISSUE_UNLOCKED, 25 = TARGET_BRANCH_CHANGED,
|
|
|
|
|
26 = DELETE_TIME_MANUAL, 27 = REVIEW_REQUEST, 28 = MERGE_PULL_REQUEST,
|
|
|
|
|
29 = PULL_PUSH_EVENT, 30 = PROJECT_CHANGED, 31 = PROJECT_BOARD_CHANGED
|
2022-05-07 11:05:52 -06:00
|
|
|
32 = DISMISSED_REVIEW, 33 = COMMENT_TYPE_CHANGE_ISSUE_REF, 34 = PR_SCHEDULE_TO_AUTO_MERGE,
|
|
|
|
|
35 = CANCEL_SCHEDULED_AUTO_MERGE_PR -->
|
2022-01-21 10:59:26 -07:00
|
|
|
{{if eq .Type 0}}
|
|
|
|
|
<div class="timeline-item comment" id="{{.HashTag}}">
|
|
|
|
|
{{if .OriginalAuthor }}
|
|
|
|
|
<span class="timeline-avatar"><img src="{{AppSubUrl}}/assets/img/avatar_default.png"></span>
|
|
|
|
|
{{else}}
|
|
|
|
|
<a class="timeline-avatar" {{if gt .Poster.ID 0}}href="{{.Poster.HomeLink}}"{{end}}>
|
|
|
|
|
{{avatar .Poster}}
|
|
|
|
|
</a>
|
|
|
|
|
{{end}}
|
|
|
|
|
<div class="content comment-container">
|
|
|
|
|
<div class="ui top attached header comment-header df ac sb">
|
|
|
|
|
<div class="comment-header-left df ac">
|
|
|
|
|
{{if .OriginalAuthor }}
|
|
|
|
|
<span class="text black mr-2">
|
|
|
|
|
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
|
|
|
|
|
{{ .OriginalAuthor }}
|
|
|
|
|
</span>
|
|
|
|
|
<span class="text grey">
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.commented_at" (.HashTag|Escape) $createdStr | Safe}} {{if $.Repository.OriginalURL}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</span>
|
|
|
|
|
<span class="text migrate">
|
2022-06-27 14:58:46 -06:00
|
|
|
({{$.locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe }}){{end}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</span>
|
|
|
|
|
{{else}}
|
Improve UI on mobile (#19546)
Start making the mobile experience not painful and be actually usable. This contains a few smaller changes to enhance this experience.
- Submit buttons on the review forms aren't columns anymore and are now allowed to be displayed on one row.
- The label/milestone & New Issue buttons were given each own row even tough, there's enough place to do it one the same row. This commit fixes that.
- The issues+Pull tab on repo's has a third item besides the label/milestone & New Issue buttons, the search bar. On desktop there's enough place to do this on one row, for mobile it isn't, currently it was using for each item a new row. This commits fixes that by only giving the searchbar a new row and have the other two buttons on the same row.
- The notification table will now be show a scrollbar instead of overflow.
- The repo buttons(Watch, Star, Fork) on mobile were showing quite big and the SVG wasn't even displayed on the same line, if the count of those numbers were too high it would even overflow. This commit removes the SVG, as there isn't any place to show them on the same row and allows them to have a new row if the counts of those buttons are high.
- The admin page can show you a lot of interesting information, on mobile the System Status + Configuration weren't properly displayed as the margin's were too high. This commit fixes that by reducing the margin to a number that makes sense on mobile.
- Fixes to not overflow the tables but instead force them to be scrollable.
- When viewing a issue or pull request, the comments aren't full-width but instead 80% and aligned to right, on mobile this is a annoyance as there isn't much width to begin with. This commits fixes that by forcing full-width and removing the avatars on the left side and instead including them inline in the comment header.
2022-05-01 10:11:21 -06:00
|
|
|
{{if gt .Poster.ID 0}}
|
|
|
|
|
<a class="inline-timeline-avatar" href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
|
|
|
|
</a>
|
|
|
|
|
{{end}}
|
2022-01-21 10:59:26 -07:00
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author"{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}>
|
|
|
|
|
{{.Poster.GetDisplayName}}
|
|
|
|
|
</a>
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.commented_at" (.HashTag|Escape) $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</span>
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
|
|
|
|
<div class="comment-header-right actions df ac">
|
|
|
|
|
{{if (.ShowRole.HasRole "Poster")}}
|
|
|
|
|
<div class="ui basic label">
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.poster"}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
{{if (.ShowRole.HasRole "Writer")}}
|
|
|
|
|
<div class="ui basic label">
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.collaborator"}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
{{if (.ShowRole.HasRole "Owner")}}
|
|
|
|
|
<div class="ui basic label">
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.owner"}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
{{if not $.Repository.IsArchived}}
|
|
|
|
|
{{template "repo/issue/view_content/add_reaction" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.RepoLink .ID)}}
|
|
|
|
|
{{template "repo/issue/view_content/context_menu" Dict "ctx" $ "item" . "delete" true "issue" true "diff" false "IsCommentPoster" (and $.IsSigned (eq $.SignedUserID .PosterID))}}
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
2020-10-31 07:17:52 -06:00
|
|
|
</div>
|
2022-01-21 10:59:26 -07:00
|
|
|
<div class="ui attached segment comment-body">
|
|
|
|
|
<div class="render-content markup" {{if or $.Permission.IsAdmin $.HasIssuesOrPullsWritePermission (and $.IsSigned (eq $.SignedUserID .PosterID))}}data-can-edit="true"{{end}}>
|
|
|
|
|
{{if .RenderedContent}}
|
|
|
|
|
{{.RenderedContent|Str2html}}
|
|
|
|
|
{{else}}
|
2022-06-27 14:58:46 -06:00
|
|
|
<span class="no-content">{{$.locale.Tr "repo.issues.no_content"}}</span>
|
2022-01-21 10:59:26 -07:00
|
|
|
{{end}}
|
|
|
|
|
</div>
|
|
|
|
|
<div id="comment-{{.ID}}" class="raw-content hide">{{.Content}}</div>
|
|
|
|
|
<div class="edit-content-zone hide" data-write="issuecomment-{{.ID}}-write" data-preview="issuecomment-{{.ID}}-preview" data-update-url="{{$.RepoLink}}/comments/{{.ID}}" data-context="{{$.RepoLink}}" data-attachment-url="{{$.RepoLink}}/comments/{{.ID}}/attachments"></div>
|
|
|
|
|
{{if .Attachments}}
|
|
|
|
|
{{template "repo/issue/view_content/attachments" Dict "ctx" $ "Attachments" .Attachments "Content" .RenderedContent}}
|
2017-03-16 23:57:43 -06:00
|
|
|
{{end}}
|
|
|
|
|
</div>
|
2022-01-21 10:59:26 -07:00
|
|
|
{{$reactions := .Reactions.GroupByType}}
|
|
|
|
|
{{if $reactions}}
|
|
|
|
|
<div class="ui attached segment reactions">
|
|
|
|
|
{{template "repo/issue/view_content/reactions" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.RepoLink .ID) "Reactions" $reactions}}
|
|
|
|
|
</div>
|
2021-04-10 21:46:37 -06:00
|
|
|
{{end}}
|
2017-03-16 23:57:43 -06:00
|
|
|
</div>
|
|
|
|
|
</div>
|
2022-01-21 10:59:26 -07:00
|
|
|
{{else if eq .Type 1}}
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
|
|
|
|
<span class="badge bg-green text-white">{{svg "octicon-dot-fill"}}</span>
|
|
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
|
|
|
|
</a>
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{if .Issue.IsPull }}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.pulls.reopened_at" .EventTag $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{else}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.reopened_at" .EventTag $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{end}}
|
|
|
|
|
</span>
|
2019-09-19 23:45:38 -06:00
|
|
|
</div>
|
2022-01-21 10:59:26 -07:00
|
|
|
{{else if eq .Type 2}}
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
|
|
|
|
<span class="badge bg-red text-white">{{svg "octicon-circle-slash"}}</span>
|
|
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
|
|
|
|
</a>
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{if .Issue.IsPull }}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.pulls.closed_at" .EventTag $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{else}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.closed_at" .EventTag $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{end}}
|
|
|
|
|
</span>
|
2017-03-16 23:57:43 -06:00
|
|
|
</div>
|
2022-01-21 10:59:26 -07:00
|
|
|
{{else if eq .Type 28}}
|
2020-04-10 16:01:41 -06:00
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
2022-01-21 10:59:26 -07:00
|
|
|
<span class="badge bg-purple text-white">{{svg "octicon-git-merge"}}</span>
|
2020-12-03 11:46:11 -07:00
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
2017-03-16 23:57:43 -06:00
|
|
|
</a>
|
2020-04-18 18:15:07 -06:00
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2022-01-21 10:59:26 -07:00
|
|
|
{{$link := printf "%s/commit/%s" $.Repository.HTMLURL ($.Issue.PullRequest.MergedCommitID|PathEscape)}}
|
|
|
|
|
{{if eq $.Issue.PullRequest.Status 3}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.manually_pull_merged_at" ($link|Escape) (ShortSha $.Issue.PullRequest.MergedCommitID) ($.BaseTarget|Escape) $createdStr | Str2html}}
|
2020-10-25 15:49:48 -06:00
|
|
|
{{else}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.pull_merged_at" ($link|Escape) (ShortSha $.Issue.PullRequest.MergedCommitID) ($.BaseTarget|Escape) $createdStr | Str2html}}
|
2020-10-25 15:49:48 -06:00
|
|
|
{{end}}
|
2020-04-18 18:15:07 -06:00
|
|
|
</span>
|
2017-03-16 23:57:43 -06:00
|
|
|
</div>
|
2022-01-21 10:59:26 -07:00
|
|
|
{{else if eq .Type 3 5 6}}
|
|
|
|
|
{{ $refFrom:= "" }}
|
|
|
|
|
{{if ne .RefRepoID .Issue.RepoID}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{ $refFrom = $.locale.Tr "repo.issues.ref_from" (.RefRepo.FullName|Escape) }}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{end}}
|
|
|
|
|
{{ $refTr := "repo.issues.ref_issue_from" }}
|
|
|
|
|
{{if .Issue.IsPull}}
|
|
|
|
|
{{ $refTr = "repo.issues.ref_pull_from" }}
|
|
|
|
|
{{else if eq .RefAction 1 }}
|
|
|
|
|
{{ $refTr = "repo.issues.ref_closing_from" }}
|
|
|
|
|
{{else if eq .RefAction 2 }}
|
|
|
|
|
{{ $refTr = "repo.issues.ref_reopening_from" }}
|
|
|
|
|
{{end}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{ $createdStr:= TimeSinceUnix .CreatedUnix $.locale }}
|
2022-01-21 10:59:26 -07:00
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
|
|
|
|
<span class="badge">{{svg "octicon-bookmark"}}</span>
|
|
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
|
|
|
|
</a>
|
|
|
|
|
{{if eq .RefAction 3}}<del>{{end}}
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr $refTr (.EventTag|Escape) $createdStr (.RefCommentHTMLURL|Escape) $refFrom | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</span>
|
|
|
|
|
{{if eq .RefAction 3}}</del>{{end}}
|
|
|
|
|
|
|
|
|
|
<div class="detail">
|
|
|
|
|
<span class="text grey"><a href="{{.RefIssueHTMLURL}}"><b>{{.RefIssueTitle}}</b> {{.RefIssueIdent}}</a></span>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 4}}
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
|
|
|
|
<span class="badge">{{svg "octicon-bookmark"}}</span>
|
|
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
|
|
|
|
</a>
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.commit_ref_at" .EventTag $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</span>
|
|
|
|
|
<div class="detail">
|
|
|
|
|
{{svg "octicon-git-commit"}}
|
|
|
|
|
<span class="text grey">{{.Content | Str2html}}</span>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 7}}
|
|
|
|
|
{{if or .AddedLabels .RemovedLabels}}
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
|
|
|
|
<span class="badge">{{svg "octicon-tag"}}</span>
|
|
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
2018-05-09 10:29:04 -06:00
|
|
|
</a>
|
|
|
|
|
<span class="text grey">
|
2022-01-21 10:59:26 -07:00
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{if and .AddedLabels (not .RemovedLabels)}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.TrN (len .AddedLabels) "repo.issues.add_label" "repo.issues.add_labels" (RenderLabels .AddedLabels) $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{else if and (not .AddedLabels) .RemovedLabels}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.TrN (len .RemovedLabels) "repo.issues.remove_label" "repo.issues.remove_labels" (RenderLabels .RemovedLabels) $createdStr | Safe}}
|
2018-05-09 10:29:04 -06:00
|
|
|
{{else}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.add_remove_labels" (RenderLabels .AddedLabels) (RenderLabels .RemovedLabels) $createdStr | Safe}}
|
2018-05-09 10:29:04 -06:00
|
|
|
{{end}}
|
|
|
|
|
</span>
|
2022-01-21 10:59:26 -07:00
|
|
|
</div>
|
2018-05-09 10:29:04 -06:00
|
|
|
{{end}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{else if eq .Type 8}}
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
|
|
|
|
<span class="badge">{{svg "octicon-milestone"}}</span>
|
|
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
|
|
|
|
</a>
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2022-06-27 14:58:46 -06:00
|
|
|
{{if gt .OldMilestoneID 0}}{{if gt .MilestoneID 0}}{{$.locale.Tr "repo.issues.change_milestone_at" (.OldMilestone.Name|Escape) (.Milestone.Name|Escape) $createdStr | Safe}}{{else}}{{$.locale.Tr "repo.issues.remove_milestone_at" (.OldMilestone.Name|Escape) $createdStr | Safe}}{{end}}{{else if gt .MilestoneID 0}}{{$.locale.Tr "repo.issues.add_milestone_at" (.Milestone.Name|Escape) $createdStr | Safe}}{{end}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</span>
|
2017-09-12 00:48:13 -06:00
|
|
|
</div>
|
2022-01-21 10:59:26 -07:00
|
|
|
{{else if eq .Type 9}}
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
|
|
|
|
<span class="badge">{{svg "octicon-person"}}</span>
|
|
|
|
|
{{if gt .AssigneeID 0}}
|
|
|
|
|
{{if .RemovedAssignee}}
|
|
|
|
|
<a href="{{.Assignee.HomeLink}}">
|
|
|
|
|
{{avatar .Assignee}}
|
|
|
|
|
</a>
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Assignee.HomeLink}}">{{.Assignee.GetDisplayName}}</a>
|
|
|
|
|
{{ if eq .Poster.ID .Assignee.ID }}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.remove_self_assignment" $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{ else }}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.remove_assignee_at" (.Poster.GetDisplayName|Escape) $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{ end }}
|
|
|
|
|
</span>
|
|
|
|
|
{{else}}
|
|
|
|
|
<a href="{{.Assignee.HomeLink}}">
|
|
|
|
|
{{avatar .Assignee}}
|
|
|
|
|
</a>
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Assignee.HomeLink}}">{{.Assignee.GetDisplayName}}</a>
|
|
|
|
|
{{if eq .Poster.ID .AssigneeID}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.self_assign_at" $createdStr | Safe}}
|
2020-01-21 03:18:52 -07:00
|
|
|
{{else}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.add_assignee_at" (.Poster.GetDisplayName|Escape) $createdStr | Safe}}
|
2020-01-21 03:18:52 -07:00
|
|
|
{{end}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</span>
|
|
|
|
|
{{end}}
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 10}}
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
|
|
|
|
<span class="badge">{{svg "octicon-pencil"}}</span>
|
|
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
|
|
|
|
</a>
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.change_title_at" (.OldTitle|RenderEmoji) (.NewTitle|RenderEmoji) $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 11}}
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
|
|
|
|
<span class="badge">{{svg "octicon-git-branch"}}</span>
|
|
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
|
|
|
|
</a>
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.delete_branch_at" (.OldRef|Escape) $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 12}}
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
|
|
|
|
<span class="badge">{{svg "octicon-clock"}}</span>
|
|
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
|
|
|
|
</a>
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.start_tracking_history" $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 13}}
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
|
|
|
|
<span class="badge">{{svg "octicon-clock"}}</span>
|
|
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
|
|
|
|
</a>
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.stop_tracking_history" $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</span>
|
|
|
|
|
{{ template "repo/issue/view_content/comments_delete_time" Dict "ctx" $ "comment" . }}
|
|
|
|
|
<div class="detail">
|
|
|
|
|
{{svg "octicon-clock"}}
|
|
|
|
|
<span class="text grey">{{.Content}}</span>
|
2020-01-21 03:18:52 -07:00
|
|
|
</div>
|
2022-01-21 10:59:26 -07:00
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 14}}
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
|
|
|
|
<span class="badge">{{svg "octicon-clock"}}</span>
|
|
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
|
|
|
|
</a>
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.add_time_history" $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</span>
|
|
|
|
|
{{ template "repo/issue/view_content/comments_delete_time" Dict "ctx" $ "comment" . }}
|
2020-01-21 03:18:52 -07:00
|
|
|
<div class="detail">
|
2022-01-21 10:59:26 -07:00
|
|
|
{{svg "octicon-clock"}}
|
|
|
|
|
<span class="text grey">{{.Content}}</span>
|
2020-01-21 03:18:52 -07:00
|
|
|
</div>
|
2022-01-21 10:59:26 -07:00
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 15}}
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
|
|
|
|
<span class="badge">{{svg "octicon-clock"}}</span>
|
|
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
|
|
|
|
</a>
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.cancel_tracking_history" $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 16}}
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
|
|
|
|
<span class="badge">{{svg "octicon-clock"}}</span>
|
|
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
|
|
|
|
</a>
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.due_date_added" .Content $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 17}}
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
|
|
|
|
<span class="badge">{{svg "octicon-clock"}}</span>
|
|
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
|
|
|
|
</a>
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2022-07-19 06:30:55 -06:00
|
|
|
{{$parsedDeadline := .Content | ParseDeadline}}
|
|
|
|
|
{{$.locale.Tr "repo.issues.due_date_modified" (index $parsedDeadline 0) (index $parsedDeadline 1) $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 18}}
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
|
|
|
|
<span class="badge">{{svg "octicon-clock"}}</span>
|
|
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
|
|
|
|
</a>
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.due_date_remove" .Content $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 19}}
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
|
|
|
|
<span class="badge">{{svg "octicon-package-dependents"}}</span>
|
|
|
|
|
<a href="{{.Poster.HomeLink}}">
|
2020-12-03 11:46:11 -07:00
|
|
|
{{avatar .Poster}}
|
2020-04-10 16:01:41 -06:00
|
|
|
</a>
|
2022-01-21 10:59:26 -07:00
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.dependency.added_dependency" $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</span>
|
|
|
|
|
{{if .DependentIssue}}
|
|
|
|
|
<div class="detail">
|
|
|
|
|
{{svg "octicon-plus"}}
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
<a href="{{.DependentIssue.HTMLURL}}">
|
|
|
|
|
{{if eq .DependentIssue.RepoID .Issue.RepoID}}
|
|
|
|
|
#{{.DependentIssue.Index}} {{.DependentIssue.Title}}
|
|
|
|
|
{{else}}
|
|
|
|
|
{{.DependentIssue.Repo.FullName}}#{{.DependentIssue.Index}} - {{.DependentIssue.Title}}
|
|
|
|
|
{{end}}
|
|
|
|
|
</a>
|
|
|
|
|
</span>
|
|
|
|
|
</div>
|
2020-01-23 10:28:15 -07:00
|
|
|
{{end}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 20}}
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
|
|
|
|
<span class="badge">{{svg "octicon-package-dependents"}}</span>
|
|
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
|
|
|
|
</a>
|
2020-04-10 16:01:41 -06:00
|
|
|
<span class="text grey">
|
2022-01-21 10:59:26 -07:00
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.dependency.removed_dependency" $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</span>
|
|
|
|
|
{{if .DependentIssue}}
|
|
|
|
|
<div class="detail">
|
|
|
|
|
<span class="text grey">{{svg "octicon-trash"}}</span>
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
<a href="{{.DependentIssue.HTMLURL}}">
|
|
|
|
|
{{if eq .DependentIssue.RepoID .Issue.RepoID}}
|
|
|
|
|
#{{.DependentIssue.Index}} {{.DependentIssue.Title}}
|
|
|
|
|
{{else}}
|
|
|
|
|
{{.DependentIssue.Repo.FullName}}#{{.DependentIssue.Index}} - {{.DependentIssue.Title}}
|
|
|
|
|
{{end}}
|
|
|
|
|
</a>
|
2021-09-18 10:22:51 -06:00
|
|
|
</span>
|
2022-01-21 10:59:26 -07:00
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 22}}
|
|
|
|
|
<div class="timeline-item-group">
|
|
|
|
|
<div class="timeline-item event">
|
|
|
|
|
{{if .OriginalAuthor }}
|
2020-04-10 16:01:41 -06:00
|
|
|
{{else}}
|
2022-01-21 10:59:26 -07:00
|
|
|
<a class="timeline-avatar"{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}>
|
|
|
|
|
{{avatar .Poster}}
|
|
|
|
|
</a>
|
2020-04-10 16:01:41 -06:00
|
|
|
{{end}}
|
2022-01-21 10:59:26 -07:00
|
|
|
<span class="badge{{if eq .Review.Type 1}} bg-green text-white{{else if eq .Review.Type 3}} bg-red text-white{{end}}">{{svg (printf "octicon-%s" .Review.Type.Icon)}}</span>
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
{{if .OriginalAuthor }}
|
|
|
|
|
<span class="text black">
|
|
|
|
|
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
|
|
|
|
|
{{ .OriginalAuthor }}
|
|
|
|
|
</span>
|
|
|
|
|
<span class="text grey"> {{if $.Repository.OriginalURL}}</span>
|
2022-06-27 14:58:46 -06:00
|
|
|
<span class="text migrate">({{$.locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe }}){{end}}</span>
|
2022-01-21 10:59:26 -07:00
|
|
|
{{else}}
|
|
|
|
|
<a class="author"{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}>{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{end}}
|
2020-01-24 14:23:10 -07:00
|
|
|
|
2022-01-21 10:59:26 -07:00
|
|
|
{{if eq .Review.Type 1}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.review.approve" $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{else if eq .Review.Type 2}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.review.comment" $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{else if eq .Review.Type 3}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.review.reject" $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{else}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.review.comment" $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{end}}
|
|
|
|
|
{{if .Review.Dismissed}}
|
2022-06-27 14:58:46 -06:00
|
|
|
<div class="ui small label">{{$.locale.Tr "repo.issues.review.dismissed_label"}}</div>
|
2022-01-21 10:59:26 -07:00
|
|
|
{{end}}
|
|
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
{{if .Content}}
|
|
|
|
|
<div class="timeline-item comment" id="{{.HashTag}}">
|
|
|
|
|
<div class="content comment-container">
|
|
|
|
|
<div class="ui top attached header comment-header df ac sb">
|
|
|
|
|
<div class="comment-header-left df ac">
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
{{if .OriginalAuthor }}
|
|
|
|
|
<span class="text black">
|
|
|
|
|
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
|
|
|
|
|
{{ .OriginalAuthor }}
|
|
|
|
|
</span>
|
|
|
|
|
<span class="text grey"> {{if $.Repository.OriginalURL}}</span>
|
2022-06-27 14:58:46 -06:00
|
|
|
<span class="text migrate">({{$.locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe }}){{end}}</span>
|
2022-01-21 10:59:26 -07:00
|
|
|
{{else}}
|
|
|
|
|
<a class="author"{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}>{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{end}}
|
2020-04-10 16:01:41 -06:00
|
|
|
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.review.left_comment" | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="comment-header-right actions df ac">
|
|
|
|
|
{{if (.ShowRole.HasRole "Poster")}}
|
|
|
|
|
<div class="ui basic label">
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.poster"}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
{{if (.ShowRole.HasRole "Writer")}}
|
|
|
|
|
<div class="ui basic label">
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.collaborator"}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
{{if (.ShowRole.HasRole "Owner")}}
|
|
|
|
|
<div class="ui basic label">
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.owner"}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
{{if not $.Repository.IsArchived}}
|
|
|
|
|
{{template "repo/issue/view_content/add_reaction" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.RepoLink .ID)}}
|
|
|
|
|
{{template "repo/issue/view_content/context_menu" Dict "ctx" $ "item" . "delete" true "issue" true "diff" false "IsCommentPoster" (and $.IsSigned (eq $.SignedUserID .PosterID))}}
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
2022-01-18 10:28:38 -07:00
|
|
|
</div>
|
2022-01-21 10:59:26 -07:00
|
|
|
<div class="ui attached segment comment-body">
|
2022-07-26 07:11:39 -06:00
|
|
|
<div class="render-content markup" {{if or $.Permission.IsAdmin $.HasIssuesOrPullsWritePermission (and $.IsSigned (eq $.SignedUserID .PosterID))}}data-can-edit="true"{{end}}>
|
2022-01-21 10:59:26 -07:00
|
|
|
{{if .RenderedContent}}
|
|
|
|
|
{{.RenderedContent|Str2html}}
|
|
|
|
|
{{else}}
|
2022-06-27 14:58:46 -06:00
|
|
|
<span class="no-content">{{$.locale.Tr "repo.issues.no_content"}}</span>
|
2022-01-18 10:28:38 -07:00
|
|
|
{{end}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</div>
|
|
|
|
|
<div id="comment-{{.ID}}" class="raw-content hide">{{.Content}}</div>
|
|
|
|
|
<div class="edit-content-zone hide" data-write="issuecomment-{{.ID}}-write" data-preview="issuecomment-{{.ID}}-preview" data-update-url="{{$.RepoLink}}/comments/{{.ID}}" data-context="{{$.RepoLink}}" data-attachment-url="{{$.RepoLink}}/comments/{{.ID}}/attachments"></div>
|
|
|
|
|
{{if .Attachments}}
|
|
|
|
|
{{template "repo/issue/view_content/attachments" Dict "ctx" $ "Attachments" .Attachments "Content" .RenderedContent}}
|
2020-04-28 12:05:39 -06:00
|
|
|
{{end}}
|
2020-04-10 16:01:41 -06:00
|
|
|
</div>
|
2022-01-21 10:59:26 -07:00
|
|
|
{{$reactions := .Reactions.GroupByType}}
|
|
|
|
|
{{if $reactions}}
|
|
|
|
|
<div class="ui attached segment reactions">
|
|
|
|
|
{{template "repo/issue/view_content/reactions" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.RepoLink .ID) "Reactions" $reactions}}
|
|
|
|
|
</div>
|
2021-06-14 19:12:33 -06:00
|
|
|
{{end}}
|
2020-04-10 16:01:41 -06:00
|
|
|
</div>
|
2019-07-06 16:03:00 -06:00
|
|
|
</div>
|
2022-01-21 10:59:26 -07:00
|
|
|
{{end}}
|
2020-04-18 07:50:25 -06:00
|
|
|
|
2022-01-21 10:59:26 -07:00
|
|
|
{{if .Review.CodeComments}}
|
|
|
|
|
<div class="timeline-item event">
|
|
|
|
|
{{ range $filename, $lines := .Review.CodeComments}}
|
|
|
|
|
{{range $line, $comms := $lines}}
|
|
|
|
|
<div class="ui segments">
|
2022-04-29 03:30:54 -06:00
|
|
|
<div class="ui segment py-3 df ac sb">
|
2022-01-21 10:59:26 -07:00
|
|
|
{{$invalid := (index $comms 0).Invalidated}}
|
|
|
|
|
{{$resolved := (index $comms 0).IsResolved}}
|
|
|
|
|
{{$resolveDoer := (index $comms 0).ResolveDoer}}
|
|
|
|
|
{{$isNotPending := (not (eq (index $comms 0).Review.Type 0))}}
|
|
|
|
|
<div class="df ac">
|
2022-04-29 03:30:54 -06:00
|
|
|
<a href="{{(index $comms 0).CodeCommentURL}}" class="file-comment ml-3 word-break">{{$filename}}</a>
|
2022-01-21 10:59:26 -07:00
|
|
|
{{if $invalid }}
|
|
|
|
|
<span class="ui label basic small ml-3">
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.review.outdated"}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</span>
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
|
|
|
|
<div>
|
|
|
|
|
{{if or $invalid $resolved}}
|
|
|
|
|
<button id="show-outdated-{{(index $comms 0).ID}}" data-comment="{{(index $comms 0).ID}}" class="{{if not $resolved}}hide {{end}}ui compact right labeled button show-outdated df ac">
|
|
|
|
|
{{svg "octicon-unfold" 16 "mr-3"}}
|
|
|
|
|
{{if $resolved}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.review.show_resolved"}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{else}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.review.show_outdated"}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{end}}
|
|
|
|
|
</button>
|
|
|
|
|
<button id="hide-outdated-{{(index $comms 0).ID}}" data-comment="{{(index $comms 0).ID}}" class="{{if $resolved}}hide {{end}}ui compact right labeled button hide-outdated df ac">
|
|
|
|
|
{{svg "octicon-fold" 16 "mr-3"}}
|
|
|
|
|
{{if $resolved}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.review.hide_resolved"}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{else}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.review.hide_outdated"}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{end}}
|
|
|
|
|
</button>
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
2021-03-31 16:19:53 -06:00
|
|
|
</div>
|
2022-01-21 10:59:26 -07:00
|
|
|
{{$diff := (CommentMustAsDiff (index $comms 0))}}
|
|
|
|
|
{{if $diff}}
|
|
|
|
|
{{$file := (index $diff.Files 0)}}
|
|
|
|
|
<div id="code-preview-{{(index $comms 0).ID}}" class="ui table segment{{if $resolved}} hide{{end}}">
|
|
|
|
|
<div class="diff-file-box diff-box file-content {{TabSizeClass $.Editorconfig $file.Name}}">
|
|
|
|
|
<div class="file-body file-code code-view code-diff code-diff-unified unicode-escaped">
|
|
|
|
|
<table>
|
|
|
|
|
<tbody>
|
|
|
|
|
{{template "repo/diff/section_unified" dict "file" $file "root" $}}
|
|
|
|
|
</tbody>
|
|
|
|
|
</table>
|
|
|
|
|
</div>
|
2020-04-10 16:01:41 -06:00
|
|
|
</div>
|
2018-08-05 22:43:22 -06:00
|
|
|
</div>
|
2022-01-21 10:59:26 -07:00
|
|
|
{{end}}
|
|
|
|
|
<div id="code-comments-{{(index $comms 0).ID}}" class="comment-code-cloud ui segment{{if $resolved}} hide{{end}}">
|
|
|
|
|
<div class="ui comments mb-0">
|
|
|
|
|
{{range $comms}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{ $createdSubStr:= TimeSinceUnix .CreatedUnix $.locale }}
|
2022-01-21 10:59:26 -07:00
|
|
|
<div class="comment code-comment pb-4" id="{{.HashTag}}">
|
|
|
|
|
<div class="content">
|
|
|
|
|
<div class="header comment-header">
|
|
|
|
|
<div class="comment-header-left df ac">
|
|
|
|
|
{{if not .OriginalAuthor }}
|
|
|
|
|
<a class="avatar">
|
|
|
|
|
{{avatar .Poster}}
|
|
|
|
|
</a>
|
|
|
|
|
{{end}}
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
{{if .OriginalAuthor }}
|
|
|
|
|
<span class="text black">
|
|
|
|
|
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
|
|
|
|
|
{{ .OriginalAuthor }}
|
|
|
|
|
</span>
|
|
|
|
|
<span class="text grey"> {{if $.Repository.OriginalURL}}</span>
|
2022-06-27 14:58:46 -06:00
|
|
|
<span class="text migrate">({{$.locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe }}){{end}}</span>
|
2022-01-21 10:59:26 -07:00
|
|
|
{{else}}
|
|
|
|
|
<a class="author"{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}>{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{end}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.commented_at" (.HashTag|Escape) $createdSubStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="comment-header-right actions df ac">
|
|
|
|
|
{{if (.ShowRole.HasRole "Poster")}}
|
|
|
|
|
<div class="ui basic label">
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.poster"}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</div>
|
2021-01-17 10:29:10 -07:00
|
|
|
{{end}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{if (.ShowRole.HasRole "Writer")}}
|
|
|
|
|
<div class="ui basic label">
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.collaborator"}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
{{if (.ShowRole.HasRole "Owner")}}
|
|
|
|
|
<div class="ui basic label">
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.owner"}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
{{if not $.Repository.IsArchived}}
|
|
|
|
|
{{template "repo/issue/view_content/add_reaction" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.RepoLink .ID)}}
|
|
|
|
|
{{template "repo/issue/view_content/context_menu" Dict "ctx" $ "item" . "delete" true "issue" true "diff" true "IsCommentPoster" (and $.IsSigned (eq $.SignedUserID .PosterID))}}
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
2021-01-17 10:29:10 -07:00
|
|
|
</div>
|
2022-01-21 10:59:26 -07:00
|
|
|
<div class="text comment-content">
|
|
|
|
|
<div class="render-content markup" {{if or $.Permission.IsAdmin $.HasIssuesOrPullsWritePermission (and $.IsSigned (eq $.SignedUserID .PosterID))}}data-can-edit="true"{{end}}>
|
|
|
|
|
{{if .RenderedContent}}
|
|
|
|
|
{{.RenderedContent|Str2html}}
|
|
|
|
|
{{else}}
|
2022-06-27 14:58:46 -06:00
|
|
|
<span class="no-content">{{$.locale.Tr "repo.issues.no_content"}}</span>
|
2021-12-05 08:04:02 -07:00
|
|
|
{{end}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</div>
|
|
|
|
|
<div id="comment-{{.ID}}" class="raw-content hide">{{.Content}}</div>
|
|
|
|
|
<div class="edit-content-zone hide" data-write="issuecomment-{{.ID}}-write" data-preview="issuecomment-{{.ID}}-preview" data-update-url="{{$.RepoLink}}/comments/{{.ID}}" data-context="{{$.RepoLink}}" data-attachment-url="{{$.RepoLink}}/comments/{{.ID}}/attachments"></div>
|
2021-01-17 10:29:10 -07:00
|
|
|
</div>
|
2022-01-21 10:59:26 -07:00
|
|
|
{{$reactions := .Reactions.GroupByType}}
|
|
|
|
|
{{if $reactions}}
|
|
|
|
|
<div class="ui attached segment reactions">
|
|
|
|
|
{{template "repo/issue/view_content/reactions" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.RepoLink .ID) "Reactions" $reactions}}
|
|
|
|
|
</div>
|
2020-11-05 12:34:04 -07:00
|
|
|
{{end}}
|
2018-08-05 22:43:22 -06:00
|
|
|
</div>
|
2021-05-08 09:28:25 -06:00
|
|
|
</div>
|
2020-04-18 07:50:25 -06:00
|
|
|
{{end}}
|
2021-05-08 09:28:25 -06:00
|
|
|
</div>
|
2022-01-21 10:59:26 -07:00
|
|
|
<div class="code-comment-buttons df ac fw mt-3 mb-2 mx-3">
|
|
|
|
|
<div class="f1">
|
|
|
|
|
{{if $resolved}}
|
|
|
|
|
<div class="ui grey text">
|
|
|
|
|
{{svg "octicon-check" 16 "mr-2"}}
|
2022-06-27 14:58:46 -06:00
|
|
|
<b>{{$resolveDoer.Name}}</b> {{$.locale.Tr "repo.issues.review.resolved_by"}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
|
|
|
|
<div class="code-comment-buttons-buttons">
|
|
|
|
|
{{if and $.CanMarkConversation $isNotPending}}
|
|
|
|
|
<button class="ui tiny basic button resolve-conversation" data-origin="timeline" data-action="{{if not $resolved}}Resolve{{else}}UnResolve{{end}}" data-comment-id="{{(index $comms 0).ID}}" data-update-url="{{$.RepoLink}}/issues/resolve_conversation">
|
|
|
|
|
{{if $resolved}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.review.un_resolve_conversation"}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{else}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.review.resolve_conversation"}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{end}}
|
|
|
|
|
</button>
|
|
|
|
|
{{end}}
|
|
|
|
|
{{if and $.SignedUserID (not $.Repository.IsArchived)}}
|
|
|
|
|
<button class="comment-form-reply ui green tiny labeled icon button ml-2 mr-0">
|
2022-06-27 14:58:46 -06:00
|
|
|
{{svg "octicon-reply" 16 "reply icon mr-2"}}{{$.locale.Tr "repo.diff.comment.reply"}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</button>
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
2021-05-08 09:28:25 -06:00
|
|
|
</div>
|
2022-01-21 10:59:26 -07:00
|
|
|
{{template "repo/diff/comment_form_datahandler" dict "hidden" true "reply" (index $comms 0).ReviewID "root" $ "comment" (index $comms 0)}}
|
2021-05-08 09:28:25 -06:00
|
|
|
</div>
|
2018-08-05 22:43:22 -06:00
|
|
|
</div>
|
2022-01-21 10:59:26 -07:00
|
|
|
{{end}}
|
2020-04-10 16:01:41 -06:00
|
|
|
{{end}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</div>
|
2018-08-05 22:43:22 -06:00
|
|
|
{{end}}
|
2020-04-10 16:01:41 -06:00
|
|
|
</div>
|
2022-01-21 10:59:26 -07:00
|
|
|
{{else if eq .Type 23}}
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
|
|
|
|
<span class="badge">{{svg "octicon-lock"}}</span>
|
|
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
|
|
|
|
</a>
|
|
|
|
|
{{ if .Content }}
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.lock_with_reason" .Content $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</span>
|
|
|
|
|
{{ else }}
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.lock_no_reason" $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</span>
|
|
|
|
|
{{ end }}
|
|
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 24}}
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
|
|
|
|
<span class="badge">{{svg "octicon-key"}}</span>
|
|
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
|
|
|
|
</a>
|
2020-04-18 18:15:07 -06:00
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.unlock_comment" $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 25}}
|
|
|
|
|
<div class="timeline-item event">
|
|
|
|
|
<span class="badge">{{svg "octicon-git-branch"}}</span>
|
|
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
|
|
|
|
</a>
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
<a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a>
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.pulls.change_target_branch_at" (.OldRef|Escape) (.NewRef|Escape) $createdStr | Safe}}
|
2019-07-06 16:03:00 -06:00
|
|
|
</span>
|
2022-01-21 10:59:26 -07:00
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 26}}
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
|
|
|
|
<span class="badge">{{svg "octicon-clock"}}</span>
|
|
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
|
|
|
|
</a>
|
2020-04-18 18:15:07 -06:00
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.del_time_history" $createdStr | Safe}}
|
2019-07-06 16:03:00 -06:00
|
|
|
</span>
|
2022-01-21 10:59:26 -07:00
|
|
|
<div class="detail">
|
|
|
|
|
{{svg "octicon-clock"}}
|
|
|
|
|
<span class="text grey">{{.Content}}</span>
|
|
|
|
|
</div>
|
2019-12-27 13:30:58 -07:00
|
|
|
</div>
|
2022-01-21 10:59:26 -07:00
|
|
|
{{else if eq .Type 27}}
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
|
|
|
|
<span class="badge">{{svg "octicon-eye"}}</span>
|
|
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
|
|
|
|
</a>
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{if (gt .AssigneeID 0)}}
|
|
|
|
|
{{if .RemovedAssignee}}
|
|
|
|
|
{{if eq .PosterID .AssigneeID}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.review.remove_review_request_self" $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{else}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.review.remove_review_request" (.Assignee.GetDisplayName|Escape) $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{end}}
|
2020-10-12 13:55:13 -06:00
|
|
|
{{else}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.review.add_review_request" (.Assignee.GetDisplayName|Escape) $createdStr | Safe}}
|
2020-10-12 13:55:13 -06:00
|
|
|
{{end}}
|
2020-04-06 10:33:34 -06:00
|
|
|
{{else}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{if .RemovedAssignee}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.review.remove_review_request" (.AssigneeTeam.Name|Escape) $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{else}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.review.add_review_request" (.AssigneeTeam.Name|Escape) $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{end}}
|
2020-10-12 13:55:13 -06:00
|
|
|
{{end}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
{{else if and (eq .Type 29) (or (gt .CommitsNum 0) .IsForcePush)}}
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
|
|
|
|
<span class="badge">{{svg "octicon-repo-push"}}</span>
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{ if .IsForcePush }}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.force_push_codes" ($.Issue.PullRequest.HeadBranch|Escape) (ShortSha .OldCommit) (($.Issue.Repo.CommitLink .OldCommit)|Escape) (ShortSha .NewCommit) (($.Issue.Repo.CommitLink .NewCommit)|Escape) $createdStr | Safe}}
|
2020-08-16 21:07:38 -06:00
|
|
|
{{else}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.TrN (len .Commits) "repo.issues.push_commit_1" "repo.issues.push_commits_n" (len .Commits) $createdStr | Safe}}
|
2020-08-16 21:07:38 -06:00
|
|
|
{{end}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
{{if not .IsForcePush}}
|
|
|
|
|
{{template "repo/commits_list_small" dict "comment" . "root" $}}
|
|
|
|
|
{{end}}
|
|
|
|
|
{{else if eq .Type 30}}
|
|
|
|
|
{{if not $.UnitProjectsGlobalDisabled}}
|
2021-02-11 10:32:25 -07:00
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
2022-01-21 10:59:26 -07:00
|
|
|
<span class="badge">{{svg "octicon-project"}}</span>
|
|
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
2021-02-11 10:32:25 -07:00
|
|
|
</a>
|
|
|
|
|
<span class="text grey">
|
2022-01-21 10:59:26 -07:00
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{if gt .OldProjectID 0}}
|
|
|
|
|
{{if gt .ProjectID 0}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.change_project_at" (.OldProject.Title|Escape) (.Project.Title|Escape) $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{else}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.remove_project_at" (.OldProject.Title|Escape) $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{end}}
|
|
|
|
|
{{else if gt .ProjectID 0}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.add_project_at" (.Project.Title|Escape) $createdStr | Safe}}
|
2021-02-11 10:32:25 -07:00
|
|
|
{{end}}
|
|
|
|
|
</span>
|
|
|
|
|
</div>
|
2022-01-21 10:59:26 -07:00
|
|
|
{{end}}
|
|
|
|
|
{{else if eq .Type 32}}
|
|
|
|
|
<div class="timeline-item-group">
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
|
|
|
|
<a class="timeline-avatar"{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}>
|
|
|
|
|
<img src="{{.Poster.AvatarLink}}">
|
|
|
|
|
</a>
|
|
|
|
|
<span class="badge grey">{{svg "octicon-x" 16}}</span>
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author"{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}>{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{$reviewerName := ""}}
|
|
|
|
|
{{if eq .Review.OriginalAuthor ""}}
|
|
|
|
|
{{$reviewerName = .Review.Reviewer.Name}}
|
|
|
|
|
{{else}}
|
|
|
|
|
{{$reviewerName = .Review.OriginalAuthor}}
|
|
|
|
|
{{end}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.review.dismissed" $reviewerName $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
{{if .Content}}
|
|
|
|
|
<div class="timeline-item comment">
|
|
|
|
|
<div class="content">
|
|
|
|
|
<div class="ui top attached header arrow-top">
|
|
|
|
|
<span class="text grey">
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "action.review_dismissed_reason"}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="ui attached segment">
|
|
|
|
|
<div class="render-content markup">
|
|
|
|
|
{{if .RenderedContent}}
|
|
|
|
|
{{.RenderedContent|Str2html}}
|
|
|
|
|
{{else}}
|
2022-06-27 14:58:46 -06:00
|
|
|
<span class="no-content">{{$.locale.Tr "repo.issues.no_content"}}</span>
|
2022-01-21 10:59:26 -07:00
|
|
|
{{end}}
|
|
|
|
|
</div>
|
2021-02-11 10:32:25 -07:00
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
2021-11-19 02:54:31 -07:00
|
|
|
{{end}}
|
2022-01-21 10:59:26 -07:00
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 33}}
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
|
|
|
|
<span class="badge">{{svg "octicon-git-branch"}}</span>
|
|
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
|
|
|
|
</a>
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{if and .OldRef .NewRef}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.change_ref_at" (.OldRef|Escape) (.NewRef|Escape) $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{else if .OldRef}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.remove_ref_at" (.OldRef|Escape) $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{else}}
|
2022-06-27 14:58:46 -06:00
|
|
|
{{$.locale.Tr "repo.issues.add_ref_at" (.NewRef|Escape) $createdStr | Safe}}
|
2022-01-21 10:59:26 -07:00
|
|
|
{{end}}
|
|
|
|
|
</span>
|
|
|
|
|
</div>
|
2022-05-07 11:05:52 -06:00
|
|
|
{{else if or (eq .Type 34) (eq .Type 35)}}
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
|
|
|
|
<span class="badge">{{svg "octicon-git-merge" 16}}</span>
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2022-06-27 14:58:46 -06:00
|
|
|
{{if eq .Type 34}}{{$.locale.Tr "repo.pulls.auto_merge_newly_scheduled_comment" $createdStr | Safe}}
|
|
|
|
|
{{else}}{{$.locale.Tr "repo.pulls.auto_merge_canceled_schedule_comment" $createdStr | Safe}}{{end}}
|
2022-05-07 11:05:52 -06:00
|
|
|
</span>
|
|
|
|
|
</div>
|
2022-01-21 10:59:26 -07:00
|
|
|
{{end}}
|
2018-08-05 22:43:22 -06:00
|
|
|
{{end}}
|
2017-03-16 23:57:43 -06:00
|
|
|
{{end}}
|