Adding upstream version 9.0.0.

Signed-off-by: Daniel Baumann <daniel@debian.org>

30 files changed, 2300 insertions, 0 deletions

diff --git a/templates/repo/issue/view_content/add_reaction.tmpl b/templates/repo/issue/view_content/add_reaction.tmpl
new file mode 100644
index 0000000..37931f2
--- /dev/null
+++ b/templates/repo/issue/view_content/add_reaction.tmpl
@@ -0,0 +1,12 @@
+{{if .ctxData.IsSigned}}
+<div class="item action ui dropdown jump pointing top right select-reaction" data-action-url="{{.ActionURL}}">
+	<a class="add-reaction muted">
+		{{svg "octicon-smiley"}}
+	</a>
+	<div class="menu reactions-menu">
+		{{range $value := AllowedReactions}}
+			<a class="item reaction" data-tooltip-content="{{$value}}" aria-label="{{$value}}" data-reaction-content="{{$value}}">{{ReactionToEmoji $value}}</a>
+		{{end}}
+	</div>
+</div>
+{{end}}
diff --git a/templates/repo/issue/view_content/attachments.tmpl b/templates/repo/issue/view_content/attachments.tmpl
new file mode 100644
index 0000000..79085df
--- /dev/null
+++ b/templates/repo/issue/view_content/attachments.tmpl
@@ -0,0 +1,42 @@
+<div class="dropzone-attachments">
+	{{if .Attachments}}
+		<div class="divider"></div>
+	{{end}}
+	{{$hasThumbnails := false}}
+	{{- range .Attachments -}}
+		<div class="tw-flex">
+			<div class="tw-flex-1 tw-p-2">
+				<a target="_blank" rel="noopener noreferrer" href="{{.DownloadURL}}" title="{{ctx.Locale.Tr "repo.issues.attachment.open_tab" .Name}}">
+					{{if FilenameIsImage .Name}}
+						{{if not (StringUtils.Contains (StringUtils.ToString $.RenderedContent) .UUID)}}
+							{{$hasThumbnails = true}}
+						{{end}}
+						{{svg "octicon-file"}}
+					{{else}}
+						{{svg "octicon-desktop-download"}}
+					{{end}}
+					<span><strong>{{.Name}}</strong></span>
+				</a>
+			</div>
+			<div class="tw-p-2 tw-flex tw-items-center">
+				<span class="ui text grey">{{.Size | ctx.Locale.TrSize}}</span>
+			</div>
+		</div>
+	{{end -}}
+
+	{{if $hasThumbnails}}
+		<div class="divider"></div>
+		<div class="ui small thumbnails">
+			{{- range .Attachments -}}
+				{{if FilenameIsImage .Name}}
+					{{if not (StringUtils.Contains (StringUtils.ToString $.RenderedContent) .UUID)}}
+					<a target="_blank" rel="noopener noreferrer" href="{{.DownloadURL}}">
+						<img alt="{{.Name}}" src="{{.DownloadURL}}" title="{{ctx.Locale.Tr "repo.issues.attachment.open_tab" .Name}}">
+					</a>
+					{{end}}
+				{{end}}
+			{{end -}}
+		</div>
+	{{end}}
+
+</div>
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
new file mode 100644
index 0000000..08c83c0
--- /dev/null
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -0,0 +1,691 @@
+{{template "base/alert"}}
+{{range .Issue.Comments}}
+	{{if call $.ShouldShowCommentType .Type}}
+		{{$createdStr:= TimeSinceUnix .CreatedUnix ctx.Locale}}
+
+		<!-- 0 = COMMENT, 1 = REOPEN, 2 = CLOSE, 3 = ISSUE_REF, 4 = COMMIT_REF,
+		5 = COMMENT_REF, 6 = PULL_REF, 7 = COMMENT_LABEL, 8 = MILESTONE_CHANGE,
+		9 = ASSIGNEES_CHANGE, 10 = TITLE_CHANGE, 11 = DELETE_BRANCH, 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
+		32 = DISMISSED_REVIEW, 33 = COMMENT_TYPE_CHANGE_ISSUE_REF, 34 = PR_SCHEDULE_TO_AUTO_MERGE,
+		35 = CANCEL_SCHEDULED_AUTO_MERGE_PR, 36 = PIN_ISSUE, 37 = UNPIN_ISSUE -->
+		{{if eq .Type 0}}
+			<div class="timeline-item comment" id="{{.HashTag}}">
+			{{if .OriginalAuthor}}
+				<span class="timeline-avatar">
+					{{ctx.AvatarUtils.Avatar nil 40}}
+				</span>
+			{{else}}
+				<a class="timeline-avatar"{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}>
+					{{ctx.AvatarUtils.Avatar .Poster 40}}
+				</a>
+			{{end}}
+				<div class="content comment-container">
+					<div class="ui top attached header comment-header tw-flex tw-items-center tw-justify-between" role="heading" aria-level="3">
+						<div class="comment-header-left tw-flex tw-items-center">
+							{{if .OriginalAuthor}}
+								<span class="text black tw-font-semibold tw-mr-1">
+									{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
+									{{.OriginalAuthor}}
+								</span>
+								<span class="text grey muted-links">
+									{{ctx.Locale.Tr "repo.issues.commented_at" .HashTag $createdStr}} {{if $.Repository.OriginalURL}}
+								</span>
+								<span class="text migrate">
+									({{ctx.Locale.Tr "repo.migrated_from" $.Repository.OriginalURL $.Repository.GetOriginalURLHostname}}){{end}}
+								</span>
+							{{else}}
+								{{if gt .Poster.ID 0}}
+									<a class="inline-timeline-avatar" href="{{.Poster.HomeLink}}">
+										{{ctx.AvatarUtils.Avatar .Poster 24}}
+									</a>
+								{{end}}
+								<span class="text grey muted-links">
+									{{template "shared/user/authorlink" .Poster}}
+									{{ctx.Locale.Tr "repo.issues.commented_at" .HashTag $createdStr}}
+								</span>
+							{{end}}
+						</div>
+						<div class="comment-header-right actions tw-flex tw-items-center">
+							{{template "repo/issue/view_content/show_role" dict "ShowRole" .ShowRole "IsPull" .Issue.IsPull}}
+							{{if not $.Repository.IsArchived}}
+								{{template "repo/issue/view_content/add_reaction" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID)}}
+							{{end}}
+							{{template "repo/issue/view_content/context_menu" dict "ctxData" $ "item" . "delete" true "issue" true "diff" false "IsCommentPoster" (and $.IsSigned (eq $.SignedUserID .PosterID))}}
+						</div>
+					</div>
+					<div class="ui attached segment comment-body" role="article">
+						<div class="render-content markup" {{if or $.Permission.IsAdmin $.HasIssuesOrPullsWritePermission (and $.IsSigned (eq $.SignedUserID .PosterID))}}data-can-edit="true"{{end}}>
+							{{if .RenderedContent}}
+								{{.RenderedContent}}
+							{{else}}
+								<span class="no-content">{{ctx.Locale.Tr "repo.issues.no_content"}}</span>
+							{{end}}
+						</div>
+						<div id="issuecomment-{{.ID}}-raw" class="raw-content tw-hidden">{{.Content}}</div>
+						<div class="edit-content-zone tw-hidden" data-update-url="{{$.RepoLink}}/comments/{{.ID}}" data-content-version="{{.ContentVersion}}" data-context="{{$.RepoLink}}" data-attachment-url="{{$.RepoLink}}/comments/{{.ID}}/attachments"></div>
+						{{if .Attachments}}
+							{{template "repo/issue/view_content/attachments" dict "Attachments" .Attachments "RenderedContent" .RenderedContent}}
+						{{end}}
+					</div>
+					{{$reactions := .Reactions.GroupByType}}
+					{{if $reactions}}
+						{{template "repo/issue/view_content/reactions" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID) "Reactions" $reactions}}
+					{{end}}
+				</div>
+			</div>
+		{{else if eq .Type 1}}
+			<div class="timeline-item event" id="{{.HashTag}}">
+				<span class="badge tw-bg-green tw-text-white">{{svg "octicon-dot-fill"}}</span>
+				{{if not .OriginalAuthor}}
+					{{template "shared/user/avatarlink" dict "user" .Poster}}
+				{{end}}
+				<span class="text grey muted-links">
+					{{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}}
+					{{if .Issue.IsPull}}
+						{{ctx.Locale.Tr "repo.pulls.reopened_at" .EventTag $createdStr}}
+					{{else}}
+						{{ctx.Locale.Tr "repo.issues.reopened_at" .EventTag $createdStr}}
+					{{end}}
+				</span>
+			</div>
+		{{else if eq .Type 2}}
+			<div class="timeline-item event" id="{{.HashTag}}">
+				<span class="badge tw-bg-red tw-text-white">{{svg "octicon-circle-slash"}}</span>
+				{{if not .OriginalAuthor}}
+					{{template "shared/user/avatarlink" dict "user" .Poster}}
+				{{end}}
+				<span class="text grey muted-links">
+					{{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}}
+					{{if .Issue.IsPull}}
+						{{ctx.Locale.Tr "repo.pulls.closed_at" .EventTag $createdStr}}
+					{{else}}
+						{{ctx.Locale.Tr "repo.issues.closed_at" .EventTag $createdStr}}
+					{{end}}
+				</span>
+			</div>
+		{{else if eq .Type 28}}
+			<div class="timeline-item event" id="{{.HashTag}}">
+				<span class="badge tw-bg-purple tw-text-white">{{svg "octicon-git-merge"}}</span>
+				{{if not .OriginalAuthor}}
+					{{template "shared/user/avatarlink" dict "user" .Poster}}
+				{{end}}
+				<span class="text grey muted-links">
+					{{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}}
+					{{$link := printf "%s/commit/%s" $.Repository.Link ($.Issue.PullRequest.MergedCommitID|PathEscape)}}
+					{{if eq $.Issue.PullRequest.Status 3}}
+						{{ctx.Locale.Tr "repo.issues.comment_manually_pull_merged_at" (HTMLFormat `<a class="ui sha" href="%[1]s"><b>%[2]s</b></a>` $link (ShortSha $.Issue.PullRequest.MergedCommitID)) (HTMLFormat "<b>%[1]s</b>" $.BaseTarget) $createdStr}}
+					{{else}}
+						{{ctx.Locale.Tr "repo.issues.comment_pull_merged_at" (HTMLFormat `<a class="ui sha" href="%[1]s"><b>%[2]s</b></a>` $link (ShortSha $.Issue.PullRequest.MergedCommitID)) (HTMLFormat "<b>%[1]s</b>" $.BaseTarget) $createdStr}}
+					{{end}}
+				</span>
+			</div>
+		{{else if eq .Type 3 5 6}}
+			{{$refFrom:= ""}}
+			{{if ne .RefRepoID .Issue.RepoID}}
+				{{$refFrom = ctx.Locale.Tr "repo.issues.ref_from" .RefRepo.FullName}}
+			{{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}}
+			{{$createdStr:= TimeSinceUnix .CreatedUnix ctx.Locale}}
+			<div class="timeline-item event" id="{{.HashTag}}">
+				<span class="badge">{{svg "octicon-bookmark"}}</span>
+				{{template "shared/user/avatarlink" dict "user" .Poster}}
+				{{if eq .RefAction 3}}<del>{{end}}
+				<span class="text grey muted-links">
+					{{template "shared/user/authorlink" .Poster}}
+					{{ctx.Locale.Tr $refTr .EventTag $createdStr (.RefCommentLink ctx) $refFrom}}
+				</span>
+				{{if eq .RefAction 3}}</del>{{end}}
+
+				<div class="detail flex-text-block">
+					<span class="text grey muted-links"><a href="{{.RefIssueLink ctx}}"><b>{{.RefIssueTitle ctx | RenderEmoji $.Context | RenderCodeBlock}}</b> {{.RefIssueIdent ctx}}</a></span>
+				</div>
+			</div>
+		{{else if eq .Type 4}}
+			<div class="timeline-item event" id="{{.HashTag}}">
+				<span class="badge">{{svg "octicon-bookmark"}}</span>
+				{{template "shared/user/avatarlink" dict "user" .Poster}}
+				<span class="text grey muted-links">
+					{{template "shared/user/authorlink" .Poster}}
+					{{if .Issue.IsPull}}
+						{{ctx.Locale.Tr "repo.pulls.commit_ref_at" .EventTag $createdStr}}
+					{{else}}
+						{{ctx.Locale.Tr "repo.issues.commit_ref_at" .EventTag $createdStr}}
+					{{end}}
+				</span>
+				<div class="detail flex-text-block">
+					{{svg "octicon-git-commit"}}
+					<span class="text grey muted-links">{{.Content | SanitizeHTML}}</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>
+					{{template "shared/user/avatarlink" dict "user" .Poster}}
+					<span class="text grey muted-links">
+						{{template "shared/user/authorlink" .Poster}}
+						{{if and .AddedLabels (not .RemovedLabels)}}
+							{{ctx.Locale.TrN (len .AddedLabels) "repo.issues.add_label" "repo.issues.add_labels" (RenderLabels $.Context ctx.Locale .AddedLabels $.RepoLink .Issue.IsPull) $createdStr}}
+						{{else if and (not .AddedLabels) .RemovedLabels}}
+							{{ctx.Locale.TrN (len .RemovedLabels) "repo.issues.remove_label" "repo.issues.remove_labels" (RenderLabels $.Context ctx.Locale .RemovedLabels $.RepoLink .Issue.IsPull) $createdStr}}
+						{{else}}
+							{{ctx.Locale.Tr "repo.issues.add_remove_labels" (RenderLabels $.Context ctx.Locale .AddedLabels $.RepoLink .Issue.IsPull) (RenderLabels $.Context ctx.Locale .RemovedLabels $.RepoLink .Issue.IsPull) $createdStr}}
+						{{end}}
+					</span>
+				</div>
+			{{end}}
+		{{else if eq .Type 8}}
+			<div class="timeline-item event" id="{{.HashTag}}">
+				<span class="badge">{{svg "octicon-milestone"}}</span>
+				{{template "shared/user/avatarlink" dict "user" .Poster}}
+				<span class="text grey muted-links">
+					{{template "shared/user/authorlink" .Poster}}
+					{{if gt .OldMilestoneID 0}}{{if gt .MilestoneID 0}}{{ctx.Locale.Tr "repo.issues.change_milestone_at" .OldMilestone.Name .Milestone.Name $createdStr}}{{else}}{{ctx.Locale.Tr "repo.issues.remove_milestone_at" .OldMilestone.Name $createdStr}}{{end}}{{else if gt .MilestoneID 0}}{{ctx.Locale.Tr "repo.issues.add_milestone_at" .Milestone.Name $createdStr}}{{end}}
+				</span>
+			</div>
+		{{else if and (eq .Type 9) (gt .AssigneeID 0)}}
+			<div class="timeline-item event" id="{{.HashTag}}">
+				<span class="badge">{{svg "octicon-person"}}</span>
+				{{if .RemovedAssignee}}
+					{{template "shared/user/avatarlink" dict "user" .Assignee}}
+					<span class="text grey muted-links">
+						{{template "shared/user/authorlink" .Assignee}}
+						{{if eq .Poster.ID .Assignee.ID}}
+							{{ctx.Locale.Tr "repo.issues.remove_self_assignment" $createdStr}}
+						{{else}}
+							{{ctx.Locale.Tr "repo.issues.remove_assignee_at" .Poster.GetDisplayName $createdStr}}
+						{{end}}
+					</span>
+				{{else}}
+					{{template "shared/user/avatarlink" dict "user" .Assignee}}
+					<span class="text grey muted-links">
+						{{template "shared/user/authorlink" .Assignee}}
+						{{if eq .Poster.ID .AssigneeID}}
+							{{ctx.Locale.Tr "repo.issues.self_assign_at" $createdStr}}
+						{{else}}
+							{{ctx.Locale.Tr "repo.issues.add_assignee_at" .Poster.GetDisplayName $createdStr}}
+						{{end}}
+					</span>
+				{{end}}
+			</div>
+		{{else if eq .Type 10}}
+			<div class="timeline-item event" id="{{.HashTag}}">
+				<span class="badge">{{svg "octicon-pencil"}}</span>
+				{{template "shared/user/avatarlink" dict "user" .Poster}}
+				<span class="text grey muted-links">
+					{{template "shared/user/authorlink" .Poster}}
+					{{ctx.Locale.Tr "repo.issues.change_title_at" (RenderRefIssueTitle $.Context .OldTitle) (RenderRefIssueTitle $.Context .NewTitle) $createdStr}}
+				</span>
+			</div>
+		{{else if eq .Type 11}}
+			<div class="timeline-item event" id="{{.HashTag}}">
+				<span class="badge">{{svg "octicon-git-branch"}}</span>
+				{{template "shared/user/avatarlink" dict "user" .Poster}}
+				<span class="text grey muted-links">
+					{{template "shared/user/authorlink" .Poster}}
+					{{ctx.Locale.Tr "repo.issues.delete_branch_at" .OldRef $createdStr}}
+				</span>
+			</div>
+		{{else if eq .Type 12}}
+			<div class="timeline-item event" id="{{.HashTag}}">
+				<span class="badge">{{svg "octicon-clock"}}</span>
+				{{template "shared/user/avatarlink" dict "user" .Poster}}
+				<span class="text grey muted-links">
+					{{template "shared/user/authorlink" .Poster}}
+					{{ctx.Locale.Tr "repo.issues.start_tracking_history" $createdStr}}
+				</span>
+			</div>
+		{{else if eq .Type 13}}
+			<div class="timeline-item event" id="{{.HashTag}}">
+				<span class="badge">{{svg "octicon-clock"}}</span>
+				{{template "shared/user/avatarlink" dict "user" .Poster}}
+				<span class="text grey muted-links">
+					{{template "shared/user/authorlink" .Poster}}
+					{{ctx.Locale.Tr "repo.issues.stop_tracking_history" $createdStr}}
+				</span>
+				{{template "repo/issue/view_content/comments_delete_time" dict "ctxData" $ "comment" .}}
+				<div class="detail flex-text-block">
+					{{svg "octicon-clock"}}
+					{{if .RenderedContent}}
+						{{/* compatibility with time comments made before v1.21 */}}
+						<span class="text grey muted-links">{{.RenderedContent}}</span>
+					{{else}}
+						<span class="text grey muted-links">{{.Content|Sec2Time}}</span>
+					{{end}}
+				</div>
+			</div>
+		{{else if eq .Type 14}}
+			<div class="timeline-item event" id="{{.HashTag}}">
+				<span class="badge">{{svg "octicon-clock"}}</span>
+				{{template "shared/user/avatarlink" dict "user" .Poster}}
+				<span class="text grey muted-links">
+					{{template "shared/user/authorlink" .Poster}}
+					{{ctx.Locale.Tr "repo.issues.add_time_history" $createdStr}}
+				</span>
+				{{template "repo/issue/view_content/comments_delete_time" dict "ctxData" $ "comment" .}}
+				<div class="detail flex-text-block">
+					{{svg "octicon-clock"}}
+					{{if .RenderedContent}}
+						{{/* compatibility with time comments made before v1.21 */}}
+						<span class="text grey muted-links">{{.RenderedContent}}</span>
+					{{else}}
+						<span class="text grey muted-links">{{.Content|Sec2Time}}</span>
+					{{end}}
+				</div>
+			</div>
+		{{else if eq .Type 15}}
+			<div class="timeline-item event" id="{{.HashTag}}">
+				<span class="badge">{{svg "octicon-clock"}}</span>
+				{{template "shared/user/avatarlink" dict "user" .Poster}}
+				<span class="text grey muted-links">
+					{{template "shared/user/authorlink" .Poster}}
+					{{ctx.Locale.Tr "repo.issues.cancel_tracking_history" $createdStr}}
+				</span>
+			</div>
+		{{else if eq .Type 16}}
+			<div class="timeline-item event" id="{{.HashTag}}">
+				<span class="badge">{{svg "octicon-clock"}}</span>
+				{{template "shared/user/avatarlink" dict "user" .Poster}}
+				<span class="text grey muted-links">
+					{{template "shared/user/authorlink" .Poster}}
+					{{ctx.Locale.Tr "repo.issues.due_date_added" (DateTime "long" .Content) $createdStr}}
+				</span>
+			</div>
+		{{else if eq .Type 17}}
+			<div class="timeline-item event" id="{{.HashTag}}">
+				<span class="badge">{{svg "octicon-clock"}}</span>
+				{{template "shared/user/avatarlink" dict "user" .Poster}}
+				<span class="text grey muted-links">
+					{{template "shared/user/authorlink" .Poster}}
+					{{$parsedDeadline := StringUtils.Split .Content "|"}}
+					{{if eq (len $parsedDeadline) 2}}
+						{{$from := DateTime "long" (index $parsedDeadline 1)}}
+						{{$to := DateTime "long" (index $parsedDeadline 0)}}
+						{{ctx.Locale.Tr "repo.issues.due_date_modified" $to $from $createdStr}}
+					{{end}}
+				</span>
+			</div>
+		{{else if eq .Type 18}}
+			<div class="timeline-item event" id="{{.HashTag}}">
+				<span class="badge">{{svg "octicon-clock"}}</span>
+				{{template "shared/user/avatarlink" dict "user" .Poster}}
+				<span class="text grey muted-links">
+					{{template "shared/user/authorlink" .Poster}}
+					{{ctx.Locale.Tr "repo.issues.due_date_remove" (DateTime "long" .Content) $createdStr}}
+				</span>
+			</div>
+		{{else if eq .Type 19}}
+			<div class="timeline-item event" id="{{.HashTag}}">
+				<span class="badge">{{svg "octicon-package-dependents"}}</span>
+				{{template "shared/user/avatarlink" dict "user" .Poster}}
+				<span class="text grey muted-links">
+					{{template "shared/user/authorlink" .Poster}}
+					{{ctx.Locale.Tr "repo.issues.dependency.added_dependency" $createdStr}}
+				</span>
+				{{if .DependentIssue}}
+					<div class="detail flex-text-block">
+						{{svg "octicon-plus"}}
+						<span class="text grey muted-links">
+							<a href="{{.DependentIssue.Link}}">
+								{{$strTitle := RenderRefIssueTitle $.Context .DependentIssue.Title}}
+								{{if eq .DependentIssue.RepoID .Issue.RepoID}}
+									#{{.DependentIssue.Index}} {{$strTitle}}
+								{{else}}
+									{{.DependentIssue.Repo.FullName}}#{{.DependentIssue.Index}} - {{$strTitle}}
+								{{end}}
+							</a>
+						</span>
+					</div>
+				{{end}}
+			</div>
+		{{else if eq .Type 20}}
+			<div class="timeline-item event" id="{{.HashTag}}">
+				<span class="badge">{{svg "octicon-package-dependents"}}</span>
+				{{template "shared/user/avatarlink" dict "user" .Poster}}
+				<span class="text grey muted-links">
+					{{template "shared/user/authorlink" .Poster}}
+					{{ctx.Locale.Tr "repo.issues.dependency.removed_dependency" $createdStr}}
+				</span>
+				{{if .DependentIssue}}
+					<div class="detail flex-text-block">
+						{{svg "octicon-trash"}}
+						<span class="text grey muted-links">
+							<a href="{{.DependentIssue.Link}}">
+								{{$strTitle := RenderRefIssueTitle $.Context .DependentIssue.Title}}
+								{{if eq .DependentIssue.RepoID .Issue.RepoID}}
+									#{{.DependentIssue.Index}} {{$strTitle}}
+								{{else}}
+									{{.DependentIssue.Repo.FullName}}#{{.DependentIssue.Index}} - {{$strTitle}}
+								{{end}}
+							</a>
+						</span>
+					</div>
+				{{end}}
+			</div>
+		{{else if eq .Type 22}}
+			<div class="timeline-item-group" id="{{.HashTag}}">
+				<div class="timeline-item event">
+					{{if not .OriginalAuthor}}
+					{{/* Some timeline avatars need a offset to correctly align with their speech bubble.
+						The condition depends on whether the comment has contents/attachments or reviews */}}
+					<a class="timeline-avatar{{if or .Content .Attachments (and .Review .Review.CodeComments)}} timeline-avatar-offset{{end}}"{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}>
+						{{ctx.AvatarUtils.Avatar .Poster 40}}
+					</a>
+					{{end}}
+					<span class="badge{{if eq .Review.Type 1}} tw-bg-green tw-text-white{{else if eq .Review.Type 3}} tw-bg-red tw-text-white{{end}}">{{svg (printf "octicon-%s" .Review.Type.Icon)}}</span>
+					<span class="text grey muted-links">
+						{{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}}
+						{{if eq .Review.Type 1}}
+							{{ctx.Locale.Tr "repo.issues.review.approve" $createdStr}}
+						{{else if eq .Review.Type 2}}
+							{{ctx.Locale.Tr "repo.issues.review.comment" $createdStr}}
+						{{else if eq .Review.Type 3}}
+							{{ctx.Locale.Tr "repo.issues.review.reject" $createdStr}}
+						{{else}}
+							{{ctx.Locale.Tr "repo.issues.review.comment" $createdStr}}
+						{{end}}
+						{{if .Review.Dismissed}}
+							<div class="ui small label">{{ctx.Locale.Tr "repo.issues.review.dismissed_label"}}</div>
+						{{end}}
+					</span>
+				</div>
+				{{if or .Content .Attachments}}
+				<div class="timeline-item comment">
+					<div class="content comment-container">
+						<div class="ui top attached header comment-header tw-flex tw-items-center tw-justify-between">
+							<div class="comment-header-left tw-flex tw-items-center">
+								{{if gt .Poster.ID 0}}
+									<a class="inline-timeline-avatar" href="{{.Poster.HomeLink}}">
+										{{ctx.AvatarUtils.Avatar .Poster 24}}
+									</a>
+								{{end}}
+								<span class="text grey muted-links">
+									{{if .OriginalAuthor}}
+										<span class="text black tw-font-semibold">
+											{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
+											{{.OriginalAuthor}}
+										</span>
+										<span class="text grey muted-links"> {{if $.Repository.OriginalURL}}</span>
+										<span class="text migrate">({{ctx.Locale.Tr "repo.migrated_from" $.Repository.OriginalURL $.Repository.GetOriginalURLHostname}}){{end}}</span>
+									{{else}}
+										{{template "shared/user/authorlink" .Poster}}
+									{{end}}
+
+									{{ctx.Locale.Tr "repo.issues.review.left_comment"}}
+								</span>
+							</div>
+							<div class="comment-header-right actions tw-flex tw-items-center">
+								{{template "repo/issue/view_content/show_role" dict "ShowRole" .ShowRole "IsPull" .Issue.IsPull}}
+								{{if not $.Repository.IsArchived}}
+									{{template "repo/issue/view_content/add_reaction" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID)}}
+									{{template "repo/issue/view_content/context_menu" dict "ctxData" $ "item" . "delete" false "issue" true "diff" false "IsCommentPoster" (and $.IsSigned (eq $.SignedUserID .PosterID))}}
+								{{end}}
+							</div>
+						</div>
+						<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}}
+								{{else}}
+									<span class="no-content">{{ctx.Locale.Tr "repo.issues.no_content"}}</span>
+								{{end}}
+							</div>
+							<div id="issuecomment-{{.ID}}-raw" class="raw-content tw-hidden">{{.Content}}</div>
+							<div class="edit-content-zone tw-hidden" data-update-url="{{$.RepoLink}}/comments/{{.ID}}" data-content-version="{{.ContentVersion}}" data-context="{{$.RepoLink}}" data-attachment-url="{{$.RepoLink}}/comments/{{.ID}}/attachments"></div>
+							{{if .Attachments}}
+								{{template "repo/issue/view_content/attachments" dict "Attachments" .Attachments "RenderedContent" .RenderedContent}}
+							{{end}}
+						</div>
+						{{$reactions := .Reactions.GroupByType}}
+						{{if $reactions}}
+							{{template "repo/issue/view_content/reactions" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID) "Reactions" $reactions}}
+						{{end}}
+					</div>
+				</div>
+				{{end}}
+
+				{{if .Review.CodeComments}}
+				<div class="timeline-item event">
+					{{range $filename, $lines := .Review.CodeComments}}
+						{{range $line, $comms := $lines}}
+							{{template "repo/issue/view_content/conversation" dict "." $ "comments" $comms}}
+						{{end}}
+					{{end}}
+				</div>
+				{{end}}
+			</div>
+		{{else if eq .Type 23}}
+			<div class="timeline-item event" id="{{.HashTag}}">
+				<span class="badge">{{svg "octicon-lock"}}</span>
+				{{template "shared/user/avatarlink" dict "user" .Poster}}
+				{{if .Content}}
+					<span class="text grey muted-links">
+						{{template "shared/user/authorlink" .Poster}}
+						{{ctx.Locale.Tr "repo.issues.lock_with_reason" .Content $createdStr}}
+					</span>
+				{{else}}
+					<span class="text grey muted-links">
+						{{template "shared/user/authorlink" .Poster}}
+						{{ctx.Locale.Tr "repo.issues.lock_no_reason" $createdStr}}
+					</span>
+				{{end}}
+			</div>
+		{{else if eq .Type 24}}
+			<div class="timeline-item event" id="{{.HashTag}}">
+				<span class="badge">{{svg "octicon-key"}}</span>
+				{{template "shared/user/avatarlink" dict "user" .Poster}}
+				<span class="text grey muted-links">
+					{{template "shared/user/authorlink" .Poster}}
+					{{ctx.Locale.Tr "repo.issues.unlock_comment" $createdStr}}
+				</span>
+			</div>
+		{{else if eq .Type 25}}
+			<div class="timeline-item event">
+				<span class="badge">{{svg "octicon-git-branch"}}</span>
+				{{if not .OriginalAuthor}}
+					{{template "shared/user/avatarlink" dict "user" .Poster}}
+				{{end}}
+				<span class="text grey muted-links">
+					{{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}}
+					{{ctx.Locale.Tr "repo.pulls.change_target_branch_at" .OldRef .NewRef $createdStr}}
+				</span>
+			</div>
+		{{else if eq .Type 26}}
+			<div class="timeline-item event" id="{{.HashTag}}">
+				<span class="badge">{{svg "octicon-clock"}}</span>
+				{{template "shared/user/avatarlink" dict "user" .Poster}}
+				<span class="text grey muted-links">
+					{{template "shared/user/authorlink" .Poster}}
+
+					{{ctx.Locale.Tr "repo.issues.del_time_history" $createdStr}}
+				</span>
+				<div class="detail flex-text-block">
+					{{svg "octicon-clock"}}
+					{{if .RenderedContent}}
+						{{/* compatibility with time comments made before v1.21 */}}
+						<span class="text grey muted-links">{{.RenderedContent}}</span>
+					{{else}}
+						<span class="text grey muted-links">- {{.Content|Sec2Time}}</span>
+					{{end}}
+				</div>
+			</div>
+		{{else if eq .Type 27}}
+			<div class="timeline-item event" id="{{.HashTag}}">
+				<span class="badge">{{svg "octicon-eye"}}</span>
+				{{template "shared/user/avatarlink" dict "user" .Poster}}
+				<span class="text grey muted-links">
+					{{template "shared/user/authorlink" .Poster}}
+					{{if (gt .AssigneeID 0)}}
+						{{if .RemovedAssignee}}
+							{{if eq .PosterID .AssigneeID}}
+								{{ctx.Locale.Tr "repo.issues.review.remove_review_request_self" $createdStr}}
+							{{else}}
+								{{ctx.Locale.Tr "repo.issues.review.remove_review_request" .Assignee.GetDisplayName $createdStr}}
+							{{end}}
+						{{else}}
+							{{ctx.Locale.Tr "repo.issues.review.add_review_request" .Assignee.GetDisplayName $createdStr}}
+						{{end}}
+					{{else}}
+						<!-- If the assigned team is deleted, just displaying "Ghost Team" in the comment -->
+						{{$teamName := "Ghost Team"}}
+						{{if .AssigneeTeam}}
+							{{$teamName = .AssigneeTeam.Name}}
+						{{end}}
+						{{if .RemovedAssignee}}
+							{{ctx.Locale.Tr "repo.issues.review.remove_review_request" $teamName $createdStr}}
+						{{else}}
+							{{ctx.Locale.Tr "repo.issues.review.add_review_request" $teamName $createdStr}}
+						{{end}}
+					{{end}}
+				</span>
+			</div>
+		{{else if and (eq .Type 29) (or (gt .CommitsNum 0) .IsForcePush)}}
+			<!-- If PR is closed, the comments whose type is CommentTypePullRequestPush(29) after latestCloseCommentID won't be rendered. //-->
+			{{if and .Issue.IsClosed (gt .ID $.LatestCloseCommentID)}}
+				{{continue}}
+			{{end}}
+			<div class="timeline-item event" id="{{.HashTag}}">
+				<span class="badge">{{svg "octicon-repo-push"}}</span>
+				<span class="text grey muted-links">
+					{{template "shared/user/authorlink" .Poster}}
+					{{if .IsForcePush}}
+						{{ctx.Locale.Tr "repo.issues.force_push_codes" $.Issue.PullRequest.HeadBranch (ShortSha .OldCommit) ($.Issue.Repo.CommitLink .OldCommit) (ShortSha .NewCommit) ($.Issue.Repo.CommitLink .NewCommit) $createdStr}}
+					{{else}}
+						{{ctx.Locale.TrN (len .Commits) "repo.issues.push_commit_1" "repo.issues.push_commits_n" (len .Commits) $createdStr}}
+					{{end}}
+				</span>
+				{{if and .IsForcePush $.Issue.PullRequest.BaseRepo.Name}}
+				<span class="tw-float-right comparebox">
+					<a href="{{$.Issue.PullRequest.BaseRepo.Link}}/compare/{{PathEscape .OldCommit}}..{{PathEscape .NewCommit}}" rel="nofollow" class="ui compare label">{{ctx.Locale.Tr "repo.issues.force_push_compare"}}</a>
+				</span>
+				{{end}}
+			</div>
+			{{if not .IsForcePush}}
+				{{template "repo/commits_list_small" dict "comment" . "root" $}}
+			{{end}}
+		{{else if eq .Type 30}}
+			{{if not $.UnitProjectsGlobalDisabled}}
+			<div class="timeline-item event" id="{{.HashTag}}">
+				<span class="badge">{{svg "octicon-project"}}</span>
+				{{template "shared/user/avatarlink" dict "user" .Poster}}
+				<span class="text grey muted-links">
+					{{template "shared/user/authorlink" .Poster}}
+					{{$oldProjectDisplayHtml := "Unknown Project"}}
+					{{if .OldProject}}
+						{{$tooltip := ctx.Locale.Tr "projects.deleted.display_name"}}
+						{{if not .OldProject.IsGhost}}
+							{{$tooltip = ctx.Locale.Tr (printf "projects.type-%d.display_name" .OldProject.Type)}}
+						{{end}}
+						{{$oldProjectDisplayHtml = HTMLFormat `<span data-tooltip-content="%s">%s</span>` $tooltip .OldProject.Title}}
+					{{end}}
+					{{$newProjectDisplayHtml := "Unknown Project"}}
+					{{if .Project}}
+						{{$tooltip := ctx.Locale.Tr "projects.deleted.display_name"}}
+						{{if not .Project.IsGhost}}
+							{{$tooltip = ctx.Locale.Tr (printf "projects.type-%d.display_name" .Project.Type)}}
+						{{end}}
+						{{$newProjectDisplayHtml = HTMLFormat `<span data-tooltip-content="%s">%s</span>` $tooltip .Project.Title}}
+					{{end}}
+					{{if and (gt .OldProjectID 0) (gt .ProjectID 0)}}
+						{{ctx.Locale.Tr "repo.issues.change_project_at" $oldProjectDisplayHtml $newProjectDisplayHtml $createdStr}}
+					{{else if gt .OldProjectID 0}}
+						{{ctx.Locale.Tr "repo.issues.remove_project_at" $oldProjectDisplayHtml $createdStr}}
+					{{else if gt .ProjectID 0}}
+						{{ctx.Locale.Tr "repo.issues.add_project_at" $newProjectDisplayHtml $createdStr}}
+					{{end}}
+				</span>
+			</div>
+			{{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 $.Context}}" width="40" height="40">
+					</a>
+					<span class="badge grey">{{svg "octicon-x" 16}}</span>
+					<span class="text grey muted-links">
+						{{template "shared/user/authorlink" .Poster}}
+						{{$reviewerName := ""}}
+						{{if eq .Review.OriginalAuthor ""}}
+							{{$reviewerName = .Review.Reviewer.Name}}
+						{{else}}
+							{{$reviewerName = .Review.OriginalAuthor}}
+						{{end}}
+						<span class="dismissed-message">{{ctx.Locale.Tr "repo.issues.review.dismissed" $reviewerName $createdStr}}</span>
+					</span>
+				</div>
+				{{if .Content}}
+					<div class="timeline-item comment">
+						<div class="content">
+							<div class="ui top attached header comment-header-left tw-flex tw-items-center arrow-top">
+								{{if gt .Poster.ID 0}}
+									<a class="inline-timeline-avatar" href="{{.Poster.HomeLink}}">
+										{{ctx.AvatarUtils.Avatar .Poster 24}}
+									</a>
+								{{end}}
+								<span class="text grey muted-links">
+									{{ctx.Locale.Tr "action.review_dismissed_reason"}}
+								</span>
+							</div>
+							<div class="ui attached segment">
+								<div class="render-content markup">
+									{{if .RenderedContent}}
+										{{.RenderedContent}}
+									{{else}}
+										<span class="no-content">{{ctx.Locale.Tr "repo.issues.no_content"}}</span>
+									{{end}}
+								</div>
+							</div>
+						</div>
+					</div>
+				{{end}}
+			</div>
+		{{else if eq .Type 33}}
+			<div class="timeline-item event" id="{{.HashTag}}">
+				<span class="badge">{{svg "octicon-git-branch"}}</span>
+				{{template "shared/user/avatarlink" dict "user" .Poster}}
+				<span class="text grey muted-links">
+					{{template "shared/user/authorlink" .Poster}}
+					{{if and .OldRef .NewRef}}
+						{{ctx.Locale.Tr "repo.issues.change_ref_at" .OldRef .NewRef $createdStr}}
+					{{else if .OldRef}}
+						{{ctx.Locale.Tr "repo.issues.remove_ref_at" .OldRef $createdStr}}
+					{{else}}
+						{{ctx.Locale.Tr "repo.issues.add_ref_at" .NewRef $createdStr}}
+					{{end}}
+				</span>
+			</div>
+		{{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 muted-links">
+					{{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}}
+					{{if eq .Type 34}}{{ctx.Locale.Tr "repo.pulls.auto_merge_newly_scheduled_comment" $createdStr}}
+					{{else}}{{ctx.Locale.Tr "repo.pulls.auto_merge_canceled_schedule_comment" $createdStr}}{{end}}
+				</span>
+			</div>
+		{{else if or (eq .Type 36) (eq .Type 37)}}
+			<div class="timeline-item event" id="{{.HashTag}}">
+				<span class="badge">{{svg "octicon-pin" 16}}</span>
+				{{template "shared/user/avatarlink" dict "user" .Poster}}
+				<span class="text grey muted-links">
+					{{template "shared/user/authorlink" .Poster}}
+					{{if eq .Type 36}}{{ctx.Locale.Tr "repo.issues.pin_comment" $createdStr}}
+					{{else}}{{ctx.Locale.Tr "repo.issues.unpin_comment" $createdStr}}{{end}}
+				</span>
+			</div>
+		{{end}}
+	{{end}}
+{{end}}
diff --git a/templates/repo/issue/view_content/comments_authorlink.tmpl b/templates/repo/issue/view_content/comments_authorlink.tmpl
new file mode 100644
index 0000000..f652a0b
--- /dev/null
+++ b/templates/repo/issue/view_content/comments_authorlink.tmpl
@@ -0,0 +1,11 @@
+{{if .comment.OriginalAuthor}}
+	<span class="text black">
+		{{svg (MigrationIcon .ctxData.Repository.GetOriginalURLHostname)}}
+		{{.comment.OriginalAuthor}}
+	</span>
+	{{if .ctxData.Repository.OriginalURL}}
+		<span class="migrate">({{ctx.Locale.Tr "repo.migrated_from" .ctxData.Repository.OriginalURL .ctxData.Repository.GetOriginalURLHostname}})</span>
+	{{end}}
+{{else}}
+	{{template "shared/user/authorlink" .comment.Poster}}
+{{end}}
diff --git a/templates/repo/issue/view_content/comments_delete_time.tmpl b/templates/repo/issue/view_content/comments_delete_time.tmpl
new file mode 100644
index 0000000..2377e7c
--- /dev/null
+++ b/templates/repo/issue/view_content/comments_delete_time.tmpl
@@ -0,0 +1,18 @@
+{{if and .comment.Time (.ctxData.Repository.IsTimetrackerEnabled ctx)}} {{/* compatibility with time comments made before v1.14 */}}
+	{{if (not .comment.Time.Deleted)}}
+		{{if (or .ctxData.IsAdmin (and .ctxData.IsSigned (eq .ctxData.SignedUserID .comment.PosterID)))}}
+			<span class="tw-float-right">
+				<div class="ui mini modal issue-delete-time-modal" data-id="{{.comment.Time.ID}}">
+					<form method="post" class="delete-time-form" action="{{.ctxData.RepoLink}}/issues/{{.ctxData.Issue.Index}}/times/{{.comment.TimeID}}/delete">
+						{{.ctxData.CsrfTokenHtml}}
+					</form>
+					<div class="header">{{ctx.Locale.Tr "repo.issues.del_time"}}</div>
+					{{template "base/modal_actions_confirm"}}
+				</div>
+				<button class="ui icon button compact mini issue-delete-time" data-id="{{.comment.Time.ID}}" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.del_time"}}">
+					{{svg "octicon-trash"}}
+				</button>
+			</span>
+		{{end}}
+	{{end}}
+{{end}}
diff --git a/templates/repo/issue/view_content/context_menu.tmpl b/templates/repo/issue/view_content/context_menu.tmpl
new file mode 100644
index 0000000..4afd73c
--- /dev/null
+++ b/templates/repo/issue/view_content/context_menu.tmpl
@@ -0,0 +1,27 @@
+<div class="item action ui dropdown jump pointing top right context-dropdown">
+	<a class="context-menu muted">
+		{{svg "octicon-kebab-horizontal"}}
+	</a>
+	<div class="menu">
+		{{$referenceUrl := ""}}
+		{{if .issue}}
+			{{$referenceUrl = printf "%s#%s" .ctxData.Issue.Link .item.HashTag}}
+		{{else}}
+			{{$referenceUrl = printf "%s/files#%s" .ctxData.Issue.Link .item.HashTag}}
+		{{end}}
+		<div class="item context js-aria-clickable" data-clipboard-text-type="url" data-clipboard-text="{{$referenceUrl}}">{{ctx.Locale.Tr "repo.issues.context.copy_link"}}</div>
+		{{if and .ctxData.IsSigned (not .ctxData.Repository.IsArchived)}}
+			<div class="item context js-aria-clickable quote-reply {{if .diff}}quote-reply-diff{{end}}" data-target="{{.item.HashTag}}-raw">{{ctx.Locale.Tr "repo.issues.context.quote_reply"}}</div>
+			{{if not .ctxData.UnitIssuesGlobalDisabled}}
+				<div class="item context js-aria-clickable reference-issue" data-target="{{.item.HashTag}}-raw" data-modal="#reference-issue-modal" data-poster="{{.item.Poster.GetDisplayName}}" data-poster-username="{{.item.Poster.Name}}" data-reference="{{$referenceUrl}}">{{ctx.Locale.Tr "repo.issues.context.reference_issue"}}</div>
+			{{end}}
+			{{if or .ctxData.Permission.IsAdmin .IsCommentPoster .ctxData.HasIssuesOrPullsWritePermission}}
+				<div class="divider"></div>
+				<div class="item context js-aria-clickable edit-content">{{ctx.Locale.Tr "repo.issues.context.edit"}}</div>
+				{{if .delete}}
+					<div class="item context js-aria-clickable delete-comment" data-comment-id={{.item.HashTag}} data-url="{{.ctxData.RepoLink}}/comments/{{.item.ID}}/delete" data-locale="{{ctx.Locale.Tr "repo.issues.delete_comment_confirm"}}">{{ctx.Locale.Tr "repo.issues.context.delete"}}</div>
+				{{end}}
+			{{end}}
+		{{end}}
+	</div>
+</div>
diff --git a/templates/repo/issue/view_content/conversation.tmpl b/templates/repo/issue/view_content/conversation.tmpl
new file mode 100644
index 0000000..c788a61
--- /dev/null
+++ b/templates/repo/issue/view_content/conversation.tmpl
@@ -0,0 +1,137 @@
+{{$invalid := (index .comments 0).Invalidated}}
+{{$resolved := (index .comments 0).IsResolved}}
+{{$resolveDoer := (index .comments 0).ResolveDoer}}
+{{$isNotPending := (not (eq (index .comments 0).Review.Type 0))}}
+<div class="ui segments conversation-holder">
+	<div class="ui segment collapsible-comment-box tw-py-2 tw-flex tw-items-center tw-justify-between">
+		<div class="tw-flex tw-items-center">
+			<a href="{{(index .comments 0).CodeCommentLink ctx}}" class="file-comment tw-ml-2 tw-break-anywhere">{{(index .comments 0).TreePath}}</a>
+			{{if $invalid}}
+				<span class="ui label basic small tw-ml-2" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.review.outdated_description"}}">
+					{{ctx.Locale.Tr "repo.issues.review.outdated"}}
+				</span>
+			{{end}}
+		</div>
+		<div>
+			{{if or $invalid $resolved}}
+				<button id="show-outdated-{{(index .comments 0).ID}}" data-comment="{{(index .comments 0).ID}}" class="{{if not $resolved}}tw-hidden {{end}}ui compact labeled button show-outdated tw-flex tw-items-center">
+					{{svg "octicon-unfold" 16 "tw-mr-2"}}
+					{{if $resolved}}
+						{{ctx.Locale.Tr "repo.issues.review.show_resolved"}}
+					{{else}}
+						{{ctx.Locale.Tr "repo.issues.review.show_outdated"}}
+					{{end}}
+				</button>
+				<button id="hide-outdated-{{(index .comments 0).ID}}" data-comment="{{(index .comments 0).ID}}" class="{{if $resolved}}tw-hidden {{end}}ui compact labeled button hide-outdated tw-flex tw-items-center">
+					{{svg "octicon-fold" 16 "tw-mr-2"}}
+					{{if $resolved}}
+						{{ctx.Locale.Tr "repo.issues.review.hide_resolved"}}
+					{{else}}
+						{{ctx.Locale.Tr "repo.issues.review.hide_outdated"}}
+					{{end}}
+				</button>
+			{{end}}
+		</div>
+	</div>
+	{{$diff := (CommentMustAsDiff ctx (index .comments 0))}}
+	{{if $diff}}
+		{{$file := (index $diff.Files 0)}}
+		<div id="code-preview-{{(index .comments 0).ID}}" class="ui table segment{{if $resolved}} tw-hidden{{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>
+			</div>
+		</div>
+	{{end}}
+	<div id="code-comments-{{(index .comments 0).ID}}" class="comment-code-cloud ui segment{{if $resolved}} tw-hidden{{end}}">
+		<div class="ui comments tw-mb-0">
+			{{range .comments}}
+				{{$createdSubStr:= TimeSinceUnix .CreatedUnix ctx.Locale}}
+				<div class="comment code-comment tw-pb-4" id="{{.HashTag}}">
+					<div class="content">
+						<div class="header comment-header">
+							<div class="comment-header-left tw-flex tw-items-center">
+								{{if not .OriginalAuthor}}
+									<a class="avatar">
+										{{ctx.AvatarUtils.Avatar .Poster 20}}
+									</a>
+								{{end}}
+								<span class="text grey muted-links">
+									{{if .OriginalAuthor}}
+										<span class="text black">
+											{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
+											{{.OriginalAuthor}}
+										</span>
+										{{if $.Repository.OriginalURL}}
+										<span class="migrate">({{ctx.Locale.Tr "repo.migrated_from" $.Repository.OriginalURL $.Repository.GetOriginalURLHostname}})</span>
+										{{end}}
+									{{else}}
+										{{template "shared/user/authorlink" .Poster}}
+									{{end}}
+									{{ctx.Locale.Tr "repo.issues.commented_at" .HashTag $createdSubStr}}
+								</span>
+							</div>
+							<div class="comment-header-right actions tw-flex tw-items-center">
+								{{template "repo/issue/view_content/show_role" dict "ShowRole" .ShowRole "IsPull" $.Issue.IsPull}}
+								{{if not $.Repository.IsArchived}}
+									{{template "repo/issue/view_content/add_reaction" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID)}}
+									{{template "repo/issue/view_content/context_menu" dict "ctxData" $ "item" . "delete" true "issue" true "diff" true "IsCommentPoster" (and $.IsSigned (eq $.SignedUserID .PosterID))}}
+								{{end}}
+							</div>
+						</div>
+						<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}}
+							{{else}}
+								<span class="no-content">{{ctx.Locale.Tr "repo.issues.no_content"}}</span>
+							{{end}}
+							</div>
+							<div id="issuecomment-{{.ID}}-raw" class="raw-content tw-hidden">{{.Content}}</div>
+							<div class="edit-content-zone tw-hidden" data-update-url="{{$.RepoLink}}/comments/{{.ID}}" data-content-version="{{.ContentVersion}}"  data-context="{{$.RepoLink}}" data-attachment-url="{{$.RepoLink}}/comments/{{.ID}}/attachments"></div>
+							{{if .Attachments}}
+								{{template "repo/issue/view_content/attachments" dict "Attachments" .Attachments "RenderedContent" .RenderedContent}}
+							{{end}}
+						</div>
+						{{$reactions := .Reactions.GroupByType}}
+						{{if $reactions}}
+							{{template "repo/issue/view_content/reactions" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID) "Reactions" $reactions}}
+						{{end}}
+					</div>
+				</div>
+			{{end}}
+		</div>
+		<div class="code-comment-buttons tw-flex tw-items-center tw-flex-wrap tw-mt-2 tw-mb-1 tw-mx-2">
+			<div class="tw-flex-1">
+				{{if $resolved}}
+					<div class="ui grey text">
+						{{svg "octicon-check" 16 "tw-mr-1"}}
+						<b>{{$resolveDoer.Name}}</b> {{ctx.Locale.Tr "repo.issues.review.resolved_by"}}
+					</div>
+				{{end}}
+			</div>
+			<div class="code-comment-buttons-buttons button-row">
+				{{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 .comments 0).ID}}" data-update-url="{{$.RepoLink}}/issues/resolve_conversation">
+						{{if $resolved}}
+							{{ctx.Locale.Tr "repo.issues.review.un_resolve_conversation"}}
+						{{else}}
+							{{ctx.Locale.Tr "repo.issues.review.resolve_conversation"}}
+						{{end}}
+					</button>
+				{{end}}
+				{{if and $.SignedUserID (not $.Repository.IsArchived)}}
+					<button class="comment-form-reply ui primary tiny labeled icon button">
+						{{svg "octicon-reply" 16 "reply icon tw-mr-1"}}{{ctx.Locale.Tr "repo.diff.comment.reply"}}
+					</button>
+				{{end}}
+			</div>
+		</div>
+		{{template "repo/diff/comment_form_datahandler" dict "hidden" true "reply" (index .comments 0).ReviewID "root" $ "comment" (index .comments 0)}}
+	</div>
+</div>
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
new file mode 100644
index 0000000..ca3c6f8
--- /dev/null
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -0,0 +1,396 @@
+{{if and .Issue.PullRequest.HasMerged (not .IsPullBranchDeletable)}}
+{{/* Then the merge box will not be displayed because this page already contains enough information */}}
+{{else}}
+<div class="timeline-item comment merge box">
+	<div class="timeline-avatar text {{if .Issue.PullRequest.HasMerged}}purple
+	{{- else if .Issue.IsClosed}}grey
+	{{- else if .IsPullWorkInProgress}}grey
+	{{- else if .IsFilesConflicted}}grey
+	{{- else if .IsPullRequestBroken}}red
+	{{- else if .IsBlockedByApprovals}}red
+	{{- else if .IsBlockedByRejection}}red
+	{{- else if .IsBlockedByOfficialReviewRequests}}red
+	{{- else if .IsBlockedByOutdatedBranch}}red
+	{{- else if .IsBlockedByChangedProtectedFiles}}red
+	{{- else if and .EnableStatusCheck (or .RequiredStatusCheckState.IsFailure .RequiredStatusCheckState.IsError)}}red
+	{{- else if and .EnableStatusCheck (or (not $.LatestCommitStatus) .RequiredStatusCheckState.IsPending .RequiredStatusCheckState.IsWarning)}}yellow
+	{{- else if and .AllowMerge .RequireSigned (not .WillSign)}}red
+	{{- else if .Issue.PullRequest.IsChecking}}yellow
+	{{- else if .Issue.PullRequest.IsEmpty}}grey
+	{{- else if .Issue.PullRequest.CanAutoMerge}}green
+	{{- else}}red{{end}}">{{svg "octicon-git-merge" 40}}</div>
+	<div class="content">
+		{{if .LatestCommitStatus}}
+		<div class="ui attached segment fitted">
+		{{template "repo/pulls/status" (dict
+			"CommitStatus" .LatestCommitStatus
+			"CommitStatuses" .LatestCommitStatuses
+			"MissingRequiredChecks" .MissingRequiredChecks
+			"ShowHideChecks" true
+			"is_context_required" .is_context_required
+		)}}
+		</div>
+		{{end}}
+		{{$showGeneralMergeForm := false}}
+		<div class="ui attached segment merge-section {{if not $.LatestCommitStatus}}no-header{{end}} flex-items-block">
+			{{if .Issue.PullRequest.HasMerged}}
+				{{if .IsPullBranchDeletable}}
+					<div class="item item-section text tw-flex-1">
+						<div class="item-section-left">
+							<h3 class="tw-mb-2">
+								{{ctx.Locale.Tr "repo.pulls.merged_success"}}
+							</h3>
+							<div class="merge-section-info">
+								{{ctx.Locale.Tr "repo.pulls.merged_info_text" (HTMLFormat "<code>%s</code>" .HeadTarget)}}
+							</div>
+						</div>
+						<div class="item-section-right">
+							<button class="delete-button ui button" data-url="{{.DeleteBranchLink}}">{{ctx.Locale.Tr "repo.branch.delete_html"}}</button>
+						</div>
+					</div>
+				{{end}}
+			{{else if .Issue.IsClosed}}
+				<div class="item item-section text tw-flex-1">
+					<div class="item-section-left">
+						<h3 class="tw-mb-2">{{ctx.Locale.Tr "repo.pulls.closed"}}</h3>
+						<div class="merge-section-info">
+							{{if .IsPullRequestBroken}}
+								{{ctx.Locale.Tr "repo.pulls.cant_reopen_deleted_branch"}}
+							{{else}}
+								{{ctx.Locale.Tr "repo.pulls.reopen_to_merge"}}
+							{{end}}
+						</div>
+					</div>
+					{{if and .IsPullBranchDeletable (not .IsPullRequestBroken)}}
+						<div class="item-section-right">
+							<button class="delete-button ui button" data-url="{{.DeleteBranchLink}}">{{ctx.Locale.Tr "repo.branch.delete_html"}}</button>
+						</div>
+					{{end}}
+				</div>
+			{{else if .IsPullFilesConflicted}}
+				<div class="item">
+					{{svg "octicon-x"}}
+					{{ctx.Locale.Tr "repo.pulls.files_conflicted"}}
+				</div>
+				<ul>
+					{{range .ConflictedFiles}}
+					<li>{{.}}</li>
+					{{end}}
+				</ul>
+			{{else if .IsPullRequestBroken}}
+				<div class="item">
+					{{svg "octicon-x"}}
+					{{ctx.Locale.Tr "repo.pulls.data_broken"}}
+				</div>
+			{{else if .IsPullWorkInProgress}}
+				<div class="item toggle-wip" data-title="{{.Issue.Title}}" data-wip-prefixes="{{JsonUtils.EncodeToString .PullRequestWorkInProgressPrefixes}}" data-update-url="{{.Issue.Link}}/title">
+					<div class="item-section-left flex-text-inline tw-flex-1">
+						{{svg "octicon-x"}}
+						{{ctx.Locale.Tr "repo.pulls.cannot_merge_work_in_progress"}}
+					</div>
+					{{if or .HasIssuesOrPullsWritePermission .IsIssuePoster}}
+						<button class="ui compact button">
+							{{ctx.Locale.Tr "repo.pulls.remove_prefix" .WorkInProgressPrefix}}
+						</button>
+					{{end}}
+				</div>
+				{{template "repo/issue/view_content/update_branch_by_merge" $}}
+			{{else if .Issue.PullRequest.IsChecking}}
+				<div class="item">
+					{{svg "octicon-sync"}}
+					{{ctx.Locale.Tr "repo.pulls.is_checking"}}
+				</div>
+			{{else if .Issue.PullRequest.IsAncestor}}
+				<div class="item">
+					{{svg "octicon-alert"}}
+					{{ctx.Locale.Tr "repo.pulls.is_ancestor"}}
+				</div>
+			{{else if or .Issue.PullRequest.CanAutoMerge .Issue.PullRequest.IsEmpty}}
+				{{if .IsBlockedByApprovals}}
+					<div class="item">
+						{{svg "octicon-x"}}
+						{{ctx.Locale.Tr "repo.pulls.blocked_by_approvals" .GrantedApprovals .ProtectedBranch.RequiredApprovals}}
+					</div>
+				{{else if .IsBlockedByRejection}}
+					<div class="item">
+						{{svg "octicon-x"}}
+					{{ctx.Locale.Tr "repo.pulls.blocked_by_rejection"}}
+					</div>
+				{{else if .IsBlockedByOfficialReviewRequests}}
+					<div class="item">
+						{{svg "octicon-x"}}
+					{{ctx.Locale.Tr "repo.pulls.blocked_by_official_review_requests"}}
+					</div>
+				{{else if .IsBlockedByOutdatedBranch}}
+					<div class="item">
+						{{svg "octicon-x"}}
+						{{ctx.Locale.Tr "repo.pulls.blocked_by_outdated_branch"}}
+					</div>
+				{{else if .IsBlockedByChangedProtectedFiles}}
+					<div class="item">
+						{{svg "octicon-x"}}
+						{{ctx.Locale.TrN $.ChangedProtectedFilesNum "repo.pulls.blocked_by_changed_protected_files_1" "repo.pulls.blocked_by_changed_protected_files_n"}}
+					</div>
+					<ul>
+						{{range .ChangedProtectedFiles}}
+						<li>{{.}}</li>
+						{{end}}
+					</ul>
+				{{else if and .EnableStatusCheck (or .RequiredStatusCheckState.IsError .RequiredStatusCheckState.IsFailure)}}
+					<div class="item">
+						{{svg "octicon-x"}}
+						{{ctx.Locale.Tr "repo.pulls.required_status_check_failed"}}
+					</div>
+				{{else if and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess)}}
+					<div class="item">
+						{{svg "octicon-x"}}
+						{{ctx.Locale.Tr "repo.pulls.required_status_check_missing"}}
+					</div>
+				{{else if and .AllowMerge .RequireSigned (not .WillSign)}}
+					<div class="item">
+						{{svg "octicon-x"}}
+						{{ctx.Locale.Tr "repo.pulls.require_signed_wont_sign"}}
+					</div>
+					<div class="item">
+						{{svg "octicon-unlock"}}
+						{{ctx.Locale.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason)}}
+					</div>
+				{{end}}
+
+				{{$notAllOverridableChecksOk := or .IsBlockedByApprovals .IsBlockedByRejection .IsBlockedByOfficialReviewRequests .IsBlockedByOutdatedBranch .IsBlockedByChangedProtectedFiles (and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess))}}
+
+				{{/* admin can merge without checks, writer can merge when checks succeed */}}
+				{{$canMergeNow := and (or (and $.IsRepoAdmin (not .ProtectedBranch.ApplyToAdmins)) (not $notAllOverridableChecksOk)) (or (not .AllowMerge) (not .RequireSigned) .WillSign)}}
+				{{/* admin and writer both can make an auto merge schedule */}}
+
+				{{if $canMergeNow}}
+					{{if $notAllOverridableChecksOk}}
+						<div class="item">
+							{{svg "octicon-dot-fill"}}
+							{{ctx.Locale.Tr "repo.pulls.required_status_check_administrator"}}
+						</div>
+					{{else}}
+						<div class="item">
+							{{svg "octicon-check"}}
+							{{ctx.Locale.Tr "repo.pulls.can_auto_merge_desc"}}
+						</div>
+					{{end}}
+					{{if .WillSign}}
+						<div class="item">
+							{{svg "octicon-lock" 16 "text green"}}
+							{{ctx.Locale.Tr "repo.signing.will_sign" .SigningKey}}
+						</div>
+					{{else if .IsSigned}}
+						<div class="item">
+							{{svg "octicon-unlock"}}
+							{{ctx.Locale.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason)}}
+						</div>
+					{{end}}
+				{{end}}
+				{{template "repo/issue/view_content/update_branch_by_merge" $}}
+				{{if .Issue.PullRequest.IsEmpty}}
+					<div class="divider"></div>
+
+					<div class="item">
+						{{svg "octicon-alert"}}
+						{{ctx.Locale.Tr "repo.pulls.is_empty"}}
+					</div>
+				{{end}}
+
+				{{if .AllowMerge}} {{/* user is allowed to merge */}}
+					{{$prUnit := .Repository.MustGetUnit $.Context $.UnitTypePullRequests}}
+					{{if or $prUnit.PullRequestsConfig.AllowMerge $prUnit.PullRequestsConfig.AllowRebase $prUnit.PullRequestsConfig.AllowRebaseMerge $prUnit.PullRequestsConfig.AllowSquash $prUnit.PullRequestsConfig.AllowFastForwardOnly}}
+						{{$hasPendingPullRequestMergeTip := ""}}
+						{{if .HasPendingPullRequestMerge}}
+							{{$createdPRMergeStr := TimeSinceUnix .PendingPullRequestMerge.CreatedUnix ctx.Locale}}
+							{{$hasPendingPullRequestMergeTip = ctx.Locale.Tr "repo.pulls.auto_merge_has_pending_schedule" .PendingPullRequestMerge.Doer.Name $createdPRMergeStr}}
+						{{end}}
+						<div class="divider"></div>
+						<script type="module">
+							const defaultMergeTitle = {{.DefaultMergeMessage}};
+							const defaultSquashMergeTitle = {{.DefaultSquashMergeMessage}};
+							const defaultMergeMessage = {{.DefaultMergeBody}};
+							const defaultSquashMergeMessage = {{.DefaultSquashMergeBody}};
+							const mergeForm = {
+								'baseLink': {{.Link}},
+								'textCancel': {{ctx.Locale.Tr "cancel"}},
+								'textDeleteBranch': {{ctx.Locale.Tr "repo.branch.delete" .HeadTarget}},
+								'textAutoMergeButtonWhenSucceed': {{ctx.Locale.Tr "repo.pulls.auto_merge_button_when_succeed"}},
+								'textAutoMergeWhenSucceed': {{ctx.Locale.Tr "repo.pulls.auto_merge_when_succeed"}},
+								'textAutoMergeCancelSchedule': {{ctx.Locale.Tr "repo.pulls.auto_merge_cancel_schedule"}},
+								'textClearMergeMessage': {{ctx.Locale.Tr "repo.pulls.clear_merge_message"}},
+								'textClearMergeMessageHint': {{ctx.Locale.Tr "repo.pulls.clear_merge_message_hint"}},
+								'textMergeCommitId': {{ctx.Locale.Tr "repo.pulls.merge_commit_id"}},
+
+								'canMergeNow': {{$canMergeNow}},
+								'allOverridableChecksOk': {{not $notAllOverridableChecksOk}},
+								'emptyCommit': {{.Issue.PullRequest.IsEmpty}},
+								'pullHeadCommitID': {{.PullHeadCommitID}},
+								'isPullBranchDeletable': {{.IsPullBranchDeletable}},
+								'defaultMergeStyle': {{.MergeStyle}},
+								'defaultDeleteBranchAfterMerge': {{$prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge}},
+								'mergeMessageFieldPlaceHolder': {{ctx.Locale.Tr "repo.editor.commit_message_desc"}},
+								'defaultMergeMessage': defaultMergeMessage,
+
+								'hasPendingPullRequestMerge': {{.HasPendingPullRequestMerge}},
+								'hasPendingPullRequestMergeTip': {{$hasPendingPullRequestMergeTip}},
+							};
+
+							const generalHideAutoMerge = mergeForm.canMergeNow && mergeForm.allOverridableChecksOk; // if this pr can be merged now, then hide the auto merge
+							mergeForm['mergeStyles'] = [
+								{
+									'name': 'merge',
+									'allowed': {{$prUnit.PullRequestsConfig.AllowMerge}},
+									'textDoMerge': {{ctx.Locale.Tr "repo.pulls.merge_pull_request"}},
+									'mergeTitleFieldText': defaultMergeTitle,
+									'mergeMessageFieldText': defaultMergeMessage,
+									'hideAutoMerge': generalHideAutoMerge,
+								},
+								{
+									'name': 'rebase',
+									'allowed': {{$prUnit.PullRequestsConfig.AllowRebase}},
+									'textDoMerge': {{ctx.Locale.Tr "repo.pulls.rebase_merge_pull_request"}},
+									'hideMergeMessageTexts': true,
+									'hideAutoMerge': generalHideAutoMerge,
+								},
+								{
+									'name': 'rebase-merge',
+									'allowed': {{$prUnit.PullRequestsConfig.AllowRebaseMerge}},
+									'textDoMerge': {{ctx.Locale.Tr "repo.pulls.rebase_merge_commit_pull_request"}},
+									'mergeTitleFieldText': defaultMergeTitle,
+									'mergeMessageFieldText': defaultMergeMessage,
+									'hideAutoMerge': generalHideAutoMerge,
+								},
+								{
+									'name': 'squash',
+									'allowed': {{$prUnit.PullRequestsConfig.AllowSquash}},
+									'textDoMerge': {{ctx.Locale.Tr "repo.pulls.squash_merge_pull_request"}},
+									'mergeTitleFieldText': defaultSquashMergeTitle,
+									'mergeMessageFieldText': {{.GetCommitMessages}} + defaultSquashMergeMessage,
+									'hideAutoMerge': generalHideAutoMerge,
+								},
+								{
+									'name': 'fast-forward-only',
+									'allowed': {{and $prUnit.PullRequestsConfig.AllowFastForwardOnly (eq .Issue.PullRequest.CommitsBehind 0)}},
+									'textDoMerge': {{ctx.Locale.Tr "repo.pulls.fast_forward_only_merge_pull_request"}},
+									'hideMergeMessageTexts': true,
+									'hideAutoMerge': generalHideAutoMerge,
+								},
+								{
+									'name': 'manually-merged',
+									'allowed': {{$prUnit.PullRequestsConfig.AllowManualMerge}},
+									'textDoMerge': {{ctx.Locale.Tr "repo.pulls.merge_manually"}},
+									'hideMergeMessageTexts': true,
+									'hideAutoMerge': true,
+								}
+							];
+							window.config.pageData.pullRequestMergeForm = mergeForm;
+						</script>
+
+						{{$showGeneralMergeForm = true}}
+						<div id="pull-request-merge-form"></div>
+					{{else}}
+						{{/* no merge style was set in repo setting: not or ($prUnit.PullRequestsConfig.AllowMerge ...) */}}
+						<div class="divider"></div>
+						<div class="item text red">
+							{{svg "octicon-x"}}
+							{{ctx.Locale.Tr "repo.pulls.no_merge_desc"}}
+						</div>
+						<div class="item">
+							{{svg "octicon-info"}}
+							{{ctx.Locale.Tr "repo.pulls.no_merge_helper"}}
+						</div>
+					{{end}} {{/* end if the repo was set to use any merge style */}}
+				{{else}}
+					{{/* user is not allowed to merge */}}
+					<div class="divider"></div>
+					<div class="item">
+						{{svg "octicon-info"}}
+						{{ctx.Locale.Tr "repo.pulls.no_merge_access"}}
+					</div>
+				{{end}} {{/* end if user is allowed to merge or not */}}
+			{{else}}
+				{{/* Merge conflict without specific file. Suggest manual merge, only if all reviews and status checks OK. */}}
+				{{if .IsBlockedByApprovals}}
+					<div class="item text red">
+						{{svg "octicon-x"}}
+					{{ctx.Locale.Tr "repo.pulls.blocked_by_approvals" .GrantedApprovals .ProtectedBranch.RequiredApprovals}}
+					</div>
+				{{else if .IsBlockedByRejection}}
+					<div class="item text red">
+						{{svg "octicon-x"}}
+						{{ctx.Locale.Tr "repo.pulls.blocked_by_rejection"}}
+					</div>
+				{{else if .IsBlockedByOfficialReviewRequests}}
+					<div class="item text red">
+						{{svg "octicon-x"}}
+						{{ctx.Locale.Tr "repo.pulls.blocked_by_official_review_requests"}}
+					</div>
+				{{else if .IsBlockedByOutdatedBranch}}
+					<div class="item text red">
+						{{svg "octicon-x"}}
+						{{ctx.Locale.Tr "repo.pulls.blocked_by_outdated_branch"}}
+					</div>
+				{{else if .IsBlockedByChangedProtectedFiles}}
+					<div class="item text red">
+						{{svg "octicon-x"}}
+						{{ctx.Locale.TrN $.ChangedProtectedFilesNum "repo.pulls.blocked_by_changed_protected_files_1" "repo.pulls.blocked_by_changed_protected_files_n"}}
+					</div>
+					<ul>
+						{{range .ChangedProtectedFiles}}
+						<li>{{.}}</li>
+						{{end}}
+					</ul>
+				{{else if and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess)}}
+					<div class="item text red">
+						{{svg "octicon-x"}}
+						{{ctx.Locale.Tr "repo.pulls.required_status_check_failed"}}
+					</div>
+				{{else if and .RequireSigned (not .WillSign)}}
+					<div class="item text red">
+						{{svg "octicon-x"}}
+						{{ctx.Locale.Tr "repo.pulls.require_signed_wont_sign"}}
+					</div>
+				{{else}}
+					<div class="item text red">
+						{{svg "octicon-x"}}
+						{{ctx.Locale.Tr "repo.pulls.cannot_auto_merge_desc"}}
+					</div>
+					<div class="item">
+						{{svg "octicon-info"}}
+						{{ctx.Locale.Tr "repo.pulls.cannot_auto_merge_helper"}}
+					</div>
+				{{end}}
+			{{end}}{{/* end if: pull request status */}}
+
+			{{/*
+			Manually Merged is not a well-known feature, it is used to mark a non-mergeable PR (already merged, conflicted) as merged
+			To test it:
+			* Enable "Manually Merged" feature in the Repository Settings
+			* Create a pull request, either:
+			* - Merge the pull request branch locally and push the merged commit to Gitea
+			* - Make some conflicts between the base branch and the pull request branch
+			* Then the Manually Merged form will be shown in the merge form
+			*/}}
+			{{if and $.StillCanManualMerge (not $showGeneralMergeForm)}}
+				<div class="divider"></div>
+				<div class="ui form">
+					<form action="{{.Link}}/merge" method="post" class="form-fetch-action">
+						{{.CsrfTokenHtml}}
+						<div class="field">
+							<input type="text" name="merge_commit_id" placeholder="{{ctx.Locale.Tr "repo.pulls.merge_commit_id"}}">
+						</div>
+						<button class="ui red button" type="submit" name="do" value="manually-merged">
+							{{ctx.Locale.Tr "repo.pulls.merge_manually"}}
+						</button>
+					</form>
+				</div>
+			{{end}}
+
+			{{if and .Issue.PullRequest.HeadRepo (not .Issue.PullRequest.HasMerged) (not .Issue.IsClosed)}}
+				{{template "repo/issue/view_content/pull_merge_instruction" dict "PullRequest" .Issue.PullRequest "ShowMergeInstructions" .ShowMergeInstructions "AutodetectManualMerge" .AutodetectManualMerge}}
+			{{end}}
+		</div>
+	</div>
+</div>
+{{end}}
diff --git a/templates/repo/issue/view_content/pull_merge_instruction.tmpl b/templates/repo/issue/view_content/pull_merge_instruction.tmpl
new file mode 100644
index 0000000..b7aae53
--- /dev/null
+++ b/templates/repo/issue/view_content/pull_merge_instruction.tmpl
@@ -0,0 +1,57 @@
+<div class="divider"></div>
+<details class="collapsible">
+	<summary class="tw-py-2"> {{ctx.Locale.Tr "repo.pulls.cmd_instruction_hint"}} </summary>
+	<div><h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_title"}}</h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_desc"}}</div>
+	{{$localBranch := .PullRequest.HeadBranch}}
+	{{if ne .PullRequest.HeadRepo.ID .PullRequest.BaseRepo.ID}}
+		{{$localBranch = print .PullRequest.HeadRepo.OwnerName "-" .PullRequest.HeadBranch}}
+	{{end}}
+	<div class="ui secondary segment">
+		{{if eq .PullRequest.Flow 0}}
+			<div>git fetch -u {{if ne .PullRequest.HeadRepo.ID .PullRequest.BaseRepo.ID}}<origin-url data-url="{{.PullRequest.HeadRepo.Link}}"></origin-url>{{else}}origin{{end}} {{.PullRequest.HeadBranch}}:{{$localBranch}}</div>
+		{{else}}
+			<div>git fetch -u origin +refs/pull/{{.PullRequest.Index}}/head:{{$localBranch}}</div>
+		{{end}}
+		<div>git checkout {{$localBranch}}</div>
+	</div>
+	{{if .ShowMergeInstructions}}
+	<div id="merge-instructions">
+		<h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_title"}}</h3>
+		{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_desc"}}
+		{{if not .AutodetectManualMerge}}
+			<p>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_warning"}}</p>
+		{{end}}
+	</div>
+	<div class="ui secondary segment">
+		<div data-pull-merge-style="merge">
+			<div>git checkout {{.PullRequest.BaseBranch}}</div>
+			<div>git merge --no-ff {{$localBranch}}</div>
+		</div>
+		<div class="tw-hidden" data-pull-merge-style="rebase">
+			<div>git checkout {{$localBranch}}</div>
+			<div>git rebase {{.PullRequest.BaseBranch}}</div>
+			<div>git checkout {{.PullRequest.BaseBranch}}</div>
+			<div>git merge --ff-only {{$localBranch}}</div>
+		</div>
+		<div class="tw-hidden" data-pull-merge-style="rebase-merge">
+			<div>git checkout {{$localBranch}}</div>
+			<div>git rebase {{.PullRequest.BaseBranch}}</div>
+			<div>git checkout {{.PullRequest.BaseBranch}}</div>
+			<div>git merge --no-ff {{$localBranch}}</div>
+		</div>
+		<div class="tw-hidden" data-pull-merge-style="squash">
+			<div>git checkout {{.PullRequest.BaseBranch}}</div>
+			<div>git merge --squash {{$localBranch}}</div>
+		</div>
+		<div class="tw-hidden" data-pull-merge-style="fast-forward-only">
+			<div>git checkout {{.PullRequest.BaseBranch}}</div>
+			<div>git merge --ff-only {{$localBranch}}</div>
+		</div>
+		<div class="tw-hidden" data-pull-merge-style="manually-merged">
+			<div>git checkout {{.PullRequest.BaseBranch}}</div>
+			<div>git merge {{$localBranch}}</div>
+		</div>
+		<div>git push origin {{.PullRequest.BaseBranch}}</div>
+	</div>
+	{{end}}
+</details>
diff --git a/templates/repo/issue/view_content/reactions.tmpl b/templates/repo/issue/view_content/reactions.tmpl
new file mode 100644
index 0000000..da63196
--- /dev/null
+++ b/templates/repo/issue/view_content/reactions.tmpl
@@ -0,0 +1,17 @@
+<div class="ui attached segment reactions" data-action-url="{{$.ActionURL}}">
+{{range $key, $value := .Reactions}}
+	{{$hasReacted := $value.HasUser $.ctxData.SignedUserID}}
+	<a role="button" class="ui label basic{{if $hasReacted}} primary{{end}}{{if not $.ctxData.IsSigned}} disabled{{end}} comment-reaction-button"
+		data-tooltip-content
+		title="{{$value.GetFirstUsers}}{{if gt ($value.GetMoreUserCount) 0}} {{ctx.Locale.Tr "repo.reactions_more" $value.GetMoreUserCount}}{{end}}"
+		aria-label="{{$value.GetFirstUsers}}{{if gt ($value.GetMoreUserCount) 0}} {{ctx.Locale.Tr "repo.reactions_more" $value.GetMoreUserCount}}{{end}}"
+		data-tooltip-placement="bottom-start"
+		data-reaction-content="{{$key}}" data-has-reacted="{{$hasReacted}}">
+		<span class="reaction">{{ReactionToEmoji $key}}</span>
+		<span class="reaction-count">{{len $value}}</span>
+	</a>
+{{end}}
+{{if AllowedReactions}}
+	{{template "repo/issue/view_content/add_reaction" dict "ctxData" $.ctxData "ActionURL" .ActionURL}}
+{{end}}
+</div>
diff --git a/templates/repo/issue/view_content/reference_issue_dialog.tmpl b/templates/repo/issue/view_content/reference_issue_dialog.tmpl
new file mode 100644
index 0000000..c7a471f
--- /dev/null
+++ b/templates/repo/issue/view_content/reference_issue_dialog.tmpl
@@ -0,0 +1,28 @@
+<div class="ui small modal" id="reference-issue-modal">
+	<div class="header">
+		{{ctx.Locale.Tr "repo.issues.context.reference_issue"}}
+	</div>
+	<div class="content">
+		<form class="ui form form-fetch-action" action="{{.Repository.Link}}/issues/new" method="post">
+			{{.CsrfTokenHtml}}
+			<div class="field">
+				<label><strong>{{ctx.Locale.Tr "repository"}}</strong></label>
+				<div class="ui search selection dropdown issue_reference_repository_search">
+					<div class="default text gt-ellipsis">{{.Repository.FullName}}</div>
+					<div class="menu"></div>
+				</div>
+			</div>
+			<div class="field">
+				<label><strong>{{ctx.Locale.Tr "repo.milestones.title"}}</strong></label>
+				<input name="title" value="" autofocus required maxlength="255" autocomplete="off">
+			</div>
+			<div class="field">
+				<label><strong>{{ctx.Locale.Tr "repo.issues.reference_issue.body"}}</strong></label>
+				<textarea name="content"></textarea>
+			</div>
+			<div class="text right">
+				<button class="ui primary button">{{ctx.Locale.Tr "repo.issues.create"}}</button>
+			</div>
+		</form>
+	</div>
+</div>
diff --git a/templates/repo/issue/view_content/show_role.tmpl b/templates/repo/issue/view_content/show_role.tmpl
new file mode 100644
index 0000000..0f1b895
--- /dev/null
+++ b/templates/repo/issue/view_content/show_role.tmpl
@@ -0,0 +1,15 @@
+{{if and .ShowRole.IsPoster (not .IgnorePoster)}}
+	<div class="ui basic label role-label" data-tooltip-content="
+		{{if .IsPull}}
+			{{ctx.Locale.Tr "repo.issues.author.tooltip.pr"}}
+		{{else}}
+			{{ctx.Locale.Tr "repo.issues.author.tooltip.issue"}}
+		{{end}}">
+		{{ctx.Locale.Tr "repo.issues.author"}}
+	</div>
+{{end}}
+{{if .ShowRole.RoleInRepo}}
+	<div class="ui basic label role-label" data-tooltip-content="{{.ShowRole.RoleInRepo.LocaleHelper ctx.Locale}}">
+		{{.ShowRole.RoleInRepo.LocaleString ctx.Locale}}
+	</div>
+{{end}}
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
new file mode 100644
index 0000000..623023b
--- /dev/null
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -0,0 +1,66 @@
+<div class="issue-content-right ui segment">
+	{{template "repo/issue/view_content/sidebar/branch_selector_field" .}}
+	{{if .Issue.IsPull}}
+		{{template "repo/issue/view_content/sidebar/pull_review" .}}
+		{{template "repo/issue/view_content/sidebar/pull_wip" .}}
+		<div class="divider"></div>
+	{{end}}
+
+	{{template "repo/issue/labels/labels_selector_field" .}}
+	{{template "repo/issue/labels/labels_sidebar" dict "root" $}}
+
+	<div class="divider"></div>
+
+	{{template "repo/issue/view_content/sidebar/milestones" .}}
+	<div class="divider"></div>
+
+	{{template "repo/issue/view_content/sidebar/projects" .}}
+	<div class="divider"></div>
+
+	{{template "repo/issue/view_content/sidebar/assignees" dict "isExistingIssue" true "." .}}
+	<div class="divider"></div>
+
+	{{if .Participants}}
+		{{template "repo/issue/view_content/sidebar/participants" .}}
+	{{end}}
+
+	{{if and $.IssueWatch (not .Repository.IsArchived)}}
+		<div class="divider"></div>
+
+		{{template "repo/issue/view_content/sidebar/watch" .}}
+	{{end}}
+
+	{{if .Repository.IsTimetrackerEnabled $.Context}}
+		{{template "repo/issue/view_content/sidebar/timetracking" .}}
+	{{end}}
+
+	<div class="divider"></div>
+	{{template "repo/issue/view_content/sidebar/due_deadline" .}}
+
+	{{if .Repository.IsDependenciesEnabled $.Context}}
+		<div class="divider"></div>
+
+		{{template "repo/issue/view_content/sidebar/dependencies" .}}
+	{{end}}
+
+	<div class="divider"></div>
+	{{template "repo/issue/view_content/sidebar/reference" .}}
+
+	{{if and .IsRepoAdmin (not .Repository.IsArchived)}}
+		<div class="divider"></div>
+
+		{{template "repo/issue/view_content/sidebar/actions" .}}
+	{{end}}
+
+	{{if and
+		.Issue.IsPull
+		.IsIssuePoster
+		(not .Issue.IsClosed)
+		.Issue.PullRequest.HeadRepo
+		(not (eq .Issue.PullRequest.HeadRepo.FullName .Issue.PullRequest.BaseRepo.FullName))
+		.CanWriteToHeadRepo
+	}}
+		<div class="divider"></div>
+		{{template "repo/issue/view_content/sidebar/pull_maintainer_edits" .}}
+	{{end}}
+</div>
diff --git a/templates/repo/issue/view_content/sidebar/actions.tmpl b/templates/repo/issue/view_content/sidebar/actions.tmpl
new file mode 100644
index 0000000..36f2182
--- /dev/null
+++ b/templates/repo/issue/view_content/sidebar/actions.tmpl
@@ -0,0 +1,114 @@
+{{if or .PinEnabled .Issue.IsPinned}}
+	<form class="tw-mt-1 form-fetch-action single-button-form" method="post" {{if $.NewPinAllowed}}action="{{.Issue.Link}}/pin"{{else}}data-tooltip-content="{{ctx.Locale.Tr "repo.issues.max_pinned"}}"{{end}}>
+		{{$.CsrfTokenHtml}}
+		<button class="fluid ui button {{if not $.NewPinAllowed}}disabled{{end}}">
+			{{if not .Issue.IsPinned}}
+				{{svg "octicon-pin" 16 "tw-mr-2"}}
+				{{ctx.Locale.Tr "pin"}}
+			{{else}}
+				{{svg "octicon-pin-slash" 16 "tw-mr-2"}}
+				{{ctx.Locale.Tr "unpin"}}
+			{{end}}
+		</button>
+	</form>
+{{end}}
+
+<button class="tw-mt-1 fluid ui show-modal button {{if .Issue.IsLocked}} negative {{end}}" data-modal="#lock">
+	{{if .Issue.IsLocked}}
+		{{svg "octicon-key"}}
+		{{ctx.Locale.Tr "repo.issues.unlock"}}
+	{{else}}
+		{{svg "octicon-lock"}}
+		{{ctx.Locale.Tr "repo.issues.lock"}}
+	{{end}}
+</button>
+<div class="ui tiny modal" id="lock">
+	<div class="header">
+		{{if .Issue.IsLocked}}
+			{{ctx.Locale.Tr "repo.issues.unlock.title"}}
+		{{else}}
+			{{ctx.Locale.Tr "repo.issues.lock.title"}}
+		{{end}}
+	</div>
+	<div class="content">
+		<div class="ui warning message">
+			{{if .Issue.IsLocked}}
+				{{ctx.Locale.Tr "repo.issues.unlock.notice_1"}}<br>
+				{{ctx.Locale.Tr "repo.issues.unlock.notice_2"}}<br>
+			{{else}}
+				{{ctx.Locale.Tr "repo.issues.lock.notice_1"}}<br>
+				{{ctx.Locale.Tr "repo.issues.lock.notice_2"}}<br>
+				{{ctx.Locale.Tr "repo.issues.lock.notice_3"}}<br>
+			{{end}}
+		</div>
+
+		<form class="ui form form-fetch-action" action="{{.Issue.Link}}{{if .Issue.IsLocked}}/unlock{{else}}/lock{{end}}"
+			method="post">
+			{{.CsrfTokenHtml}}
+
+			{{if not .Issue.IsLocked}}
+				<div class="field">
+					<strong> {{ctx.Locale.Tr "repo.issues.lock.reason"}} </strong>
+				</div>
+
+				<div class="field">
+					<div class="ui fluid dropdown selection">
+
+						<select name="reason">
+							<option value=""> </option>
+							{{range .LockReasons}}
+								<option value="{{.}}">{{.}}</option>
+							{{end}}
+						</select>
+						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+
+						<div class="default text"> </div>
+
+						<div class="menu">
+							{{range .LockReasons}}
+								<div class="item" data-value="{{.}}">{{.}}</div>
+							{{end}}
+						</div>
+					</div>
+				</div>
+			{{end}}
+
+			<div class="text right actions">
+				<button class="ui cancel button">{{ctx.Locale.Tr "settings.cancel"}}</button>
+				<button class="ui red button">
+					{{if .Issue.IsLocked}}
+						{{ctx.Locale.Tr "repo.issues.unlock_confirm"}}
+					{{else}}
+						{{ctx.Locale.Tr "repo.issues.lock_confirm"}}
+					{{end}}
+				</button>
+			</div>
+		</form>
+	</div>
+</div>
+<button class="tw-mt-1 fluid ui show-modal button" data-modal="#sidebar-delete-issue">
+	{{svg "octicon-trash"}}
+	{{ctx.Locale.Tr "repo.issues.delete"}}
+</button>
+<div class="ui g-modal-confirm modal" id="sidebar-delete-issue">
+	<div class="header">
+		{{if .Issue.IsPull}}
+			{{ctx.Locale.Tr "repo.pulls.delete.title"}}
+		{{else}}
+			{{ctx.Locale.Tr "repo.issues.delete.title"}}
+		{{end}}
+	</div>
+	<div class="content">
+		<p>
+			{{if .Issue.IsPull}}
+				{{ctx.Locale.Tr "repo.pulls.delete.text"}}
+			{{else}}
+				{{ctx.Locale.Tr "repo.issues.delete.text"}}
+			{{end}}
+		</p>
+	</div>
+	<form action="{{.Issue.Link}}/delete" method="post">
+		{{.CsrfTokenHtml}}
+		{{template "base/modal_actions_confirm" .}}
+	</form>
+</div>
diff --git a/templates/repo/issue/view_content/sidebar/assignees.tmpl b/templates/repo/issue/view_content/sidebar/assignees.tmpl
new file mode 100644
index 0000000..7a928fa
--- /dev/null
+++ b/templates/repo/issue/view_content/sidebar/assignees.tmpl
@@ -0,0 +1,62 @@
+<input id="assignee_ids" name="assignee_ids" type="hidden" value="{{.assignee_ids}}">
+<div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating jump select-assignees{{if .isExistingIssue}}-modify{{end}} dropdown">
+	<a class="text muted flex-text-block">
+		<strong>{{ctx.Locale.Tr "repo.issues.new.assignees"}}</strong>
+		{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
+			{{svg "octicon-gear" 16 "tw-ml-1"}}
+		{{end}}
+	</a>
+	<div class="filter menu" {{if .isExistingIssue}} data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/assignee" {{else}} data-id="#assignee_ids" {{end}}>
+		<div class="ui icon search input">
+			<i class="icon">{{svg "octicon-search" 16}}</i>
+			<input type="text" placeholder="{{ctx.Locale.Tr "repo.issues.filter_assignees"}}">
+		</div>
+		<div class="no-select item">{{ctx.Locale.Tr "repo.issues.new.clear_assignees"}}</div>
+		{{range .Assignees}}
+
+			{{$AssigneeID := .ID}}
+			<a class="item{{range $.Issue.Assignees}}{{if eq .ID $AssigneeID}} checked{{end}}{{end}}" href="#" data-id="{{.ID}}" data-id-selector="#assignee_{{.ID}}">
+				{{$checked := false}}
+				{{range $.Issue.Assignees}}
+					{{if eq .ID $AssigneeID}}
+						{{$checked = true}}
+					{{end}}
+				{{end}}
+				<span class="octicon-check {{if not $checked}}tw-invisible{{end}}">{{svg "octicon-check"}}</span>
+				<span class="text">
+					{{ctx.AvatarUtils.Avatar . 20 "tw-mr-2"}}{{template "repo/search_name" .}}
+				</span>
+			</a>
+		{{end}}
+	</div>
+</div>
+<div class="ui assignees list">
+	<span class="no-select item {{if .Issue.Assignees}}tw-hidden{{end}}">
+		{{ctx.Locale.Tr "repo.issues.new.no_assignees"}}
+		{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
+			{{with index .Assignees 0}}
+				–
+				<a class="select-assign-me" href="#" data-id="{{.ID}}" data-id-selector="#assignee_{{.ID}}" {{if $.isExistingIssue}} data-action="update" {{end}} data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/assignee" role="option">
+					{{ctx.Locale.Tr "repo.issues.new.assign_to_me"}}
+				</a>
+			{{end}}
+		{{end}}
+	</span>
+	<div class="selected">
+		{{if .isExistingIssue}}
+			{{range .Issue.Assignees}}
+				<div class="item">
+					<a class="muted sidebar-item-link" href="{{$.RepoLink}}/{{if $.Issue.IsPull}}pulls{{else}}issues{{end}}?assignee={{.ID}}">
+						{{ctx.AvatarUtils.Avatar . 28 "tw-mr-2"}}{{.GetDisplayName}}
+					</a>
+				</div>
+			{{end}}
+		{{else}}
+			{{range .Assignees}}
+				<a class="item tw-p-1 muted tw-hidden" id="assignee_{{.ID}}" href="{{$.RepoLink}}/{{if $.Issue.IsPull}}pulls{{else}}issues{{end}}?assignee={{.ID}}">
+					{{ctx.AvatarUtils.Avatar . 28 "tw-mr-2"}}{{.GetDisplayName}}
+				</a>
+			{{end}}
+		{{end}}
+	</div>
+</div>
diff --git a/templates/repo/issue/view_content/sidebar/branch_selector_field.tmpl b/templates/repo/issue/view_content/sidebar/branch_selector_field.tmpl
new file mode 100644
index 0000000..c23e13b
--- /dev/null
+++ b/templates/repo/issue/view_content/sidebar/branch_selector_field.tmpl
@@ -0,0 +1,59 @@
+{{if and (not .Issue.IsPull) (not .PageIsComparePull)}}
+<input id="ref_selector" name="ref" type="hidden" value="{{.Reference}}">
+<input id="editing_mode" name="edit_mode" type="hidden" value="{{(or .IsIssueWriter .HasIssuesOrPullsWritePermission)}}">
+<form method="post" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/ref" id="update_issueref_form">
+	{{$.CsrfTokenHtml}}
+</form>
+{{/* TODO: share this branch selector dropdown with the same in repo page */}}
+<div class="ui {{if not .HasIssuesOrPullsWritePermission}}disabled{{end}} floating filter select-branch dropdown tw-max-w-full" data-no-results="{{ctx.Locale.Tr "repo.pulls.no_results"}}">
+	<div class="ui basic small button">
+		<span class="text branch-name gt-ellipsis">{{if .Reference}}{{$.RefEndName}}{{else}}{{ctx.Locale.Tr "repo.issues.no_ref"}}{{end}}</span>
+		{{if .HasIssuesOrPullsWritePermission}}{{svg "octicon-triangle-down" 14 "dropdown icon"}}{{end}}
+	</div>
+	<div class="menu">
+		<div class="ui icon search input">
+			<i class="icon">{{svg "octicon-filter" 16}}</i>
+			<input name="search" placeholder="{{ctx.Locale.Tr "repo.filter_branch_and_tag"}}...">
+		</div>
+		<div class="header">
+			<div class="ui grid">
+				<div class="two column row">
+					<a class="reference column muted" href="#" data-target="#branch-list">
+						<span class="text black">
+							{{svg "octicon-git-branch" 16 "tw-mr-1"}}{{ctx.Locale.Tr "repo.branches"}}
+						</span>
+					</a>
+					<a class="reference column muted" href="#" data-target="#tag-list">
+						<span class="text">
+							{{svg "octicon-tag" 16 "tw-mr-1"}}{{ctx.Locale.Tr "repo.tags"}}
+						</span>
+					</a>
+				</div>
+			</div>
+		</div>
+		<div class="branch-tag-divider"></div>
+		<div id="branch-list" class="scrolling menu reference-list-menu {{if not .Issue}}new-issue{{end}}">
+			{{if .Reference}}
+				<div class="item text small" data-id="" data-id-selector="#ref_selector"><strong><a href="#">{{ctx.Locale.Tr "repo.clear_ref"}}</a></strong></div>
+			{{end}}
+			{{range .Branches}}
+				<div class="item" data-id="refs/heads/{{.}}" data-name="{{.}}" data-id-selector="#ref_selector" title="{{.}}">{{.}}</div>
+			{{else}}
+				<div class="item">{{ctx.Locale.Tr "repo.pulls.no_results"}}</div>
+			{{end}}
+		</div>
+		<div id="tag-list" class="scrolling menu reference-list-menu {{if not .Issue}}new-issue{{end}} tw-hidden">
+			{{if .Reference}}
+				<div class="item text small" data-id="" data-id-selector="#ref_selector"><strong><a href="#">{{ctx.Locale.Tr "repo.clear_ref"}}</a></strong></div>
+			{{end}}
+			{{range .Tags}}
+				<div class="item" data-id="refs/tags/{{.}}" data-name="tags/{{.}}" data-id-selector="#ref_selector">{{.}}</div>
+			{{else}}
+				<div class="item">{{ctx.Locale.Tr "repo.pulls.no_results"}}</div>
+			{{end}}
+		</div>
+	</div>
+</div>
+
+<div class="divider"></div>
+{{end}}
diff --git a/templates/repo/issue/view_content/sidebar/dependencies.tmpl b/templates/repo/issue/view_content/sidebar/dependencies.tmpl
new file mode 100644
index 0000000..6a9b651
--- /dev/null
+++ b/templates/repo/issue/view_content/sidebar/dependencies.tmpl
@@ -0,0 +1,146 @@
+<div class="ui depending">
+	{{if (and (not .BlockedByDependencies) (not .BlockedByDependenciesNotPermitted) (not .BlockingDependencies) (not .BlockingDependenciesNotPermitted))}}
+		<span class="text"><strong>{{ctx.Locale.Tr "repo.issues.dependency.title"}}</strong></span>
+		<br>
+		<p>
+			{{if .Issue.IsPull}}
+				{{ctx.Locale.Tr "repo.issues.dependency.pr_no_dependencies"}}
+			{{else}}
+				{{ctx.Locale.Tr "repo.issues.dependency.issue_no_dependencies"}}
+			{{end}}
+		</p>
+	{{end}}
+
+	{{if or .BlockingDependencies .BlockingDependenciesNotPermitted}}
+		<span class="text" data-tooltip-content="{{if .Issue.IsPull}}{{ctx.Locale.Tr "repo.issues.dependency.pr_close_blocks"}}{{else}}{{ctx.Locale.Tr "repo.issues.dependency.issue_close_blocks"}}{{end}}">
+			<strong>{{ctx.Locale.Tr "repo.issues.dependency.blocks_short"}}</strong>
+		</span>
+		<div class="ui relaxed divided list">
+			{{range .BlockingDependencies}}
+				<div class="item dependency{{if .Issue.IsClosed}} is-closed{{end}} tw-flex tw-items-center tw-justify-between">
+					<div class="item-left tw-flex tw-justify-center tw-flex-col tw-flex-1 gt-ellipsis">
+						<a class="title muted" href="{{.Issue.Link}}" data-tooltip-content="#{{.Issue.Index}} {{RenderRefIssueTitle $.Context .Issue.Title}}}">
+							#{{.Issue.Index}} {{RenderRefIssueTitle $.Context .Issue.Title}}}
+						</a>
+						<div class="text small gt-ellipsis" data-tooltip-content="{{.Repository.OwnerName}}/{{.Repository.Name}}">
+							{{.Repository.OwnerName}}/{{.Repository.Name}}
+						</div>
+					</div>
+					<div class="item-right tw-flex tw-items-center tw-m-1">
+						{{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}}
+							<a class="delete-dependency-button ci muted" data-id="{{.Issue.ID}}" data-type="blocking" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.dependency.remove_info"}}">
+								{{svg "octicon-trash" 16}}
+							</a>
+						{{end}}
+					</div>
+				</div>
+			{{end}}
+			{{if .BlockingDependenciesNotPermitted}}
+				<div class="item tw-flex tw-items-center tw-justify-between gt-ellipsis">
+					<span>{{ctx.Locale.TrN (len .BlockingDependenciesNotPermitted) "repo.issues.dependency.no_permission_1" "repo.issues.dependency.no_permission_n" (len .BlockingDependenciesNotPermitted)}}</span>
+				</div>
+			{{end}}
+		</div>
+	{{end}}
+
+	{{if or .BlockedByDependencies .BlockedByDependenciesNotPermitted}}
+		<span class="text" data-tooltip-content="{{if .Issue.IsPull}}{{ctx.Locale.Tr "repo.issues.dependency.pr_closing_blockedby"}}{{else}}{{ctx.Locale.Tr "repo.issues.dependency.issue_closing_blockedby"}}{{end}}">
+			<strong>{{ctx.Locale.Tr "repo.issues.dependency.blocked_by_short"}}</strong>
+		</span>
+		<div class="ui relaxed divided list">
+			{{range .BlockedByDependencies}}
+				<div class="item dependency{{if .Issue.IsClosed}} is-closed{{end}} tw-flex tw-items-center tw-justify-between">
+					<div class="item-left tw-flex tw-justify-center tw-flex-col tw-flex-1 gt-ellipsis">
+						{{$title := RenderRefIssueTitle $.Context .Issue.Title}}
+						<a class="title muted" href="{{.Issue.Link}}" data-tooltip-content="#{{.Issue.Index}} {{RenderRefIssueTitle $.Context .Issue.Title}}">
+							#{{.Issue.Index}} {{RenderRefIssueTitle $.Context .Issue.Title}}
+						</a>
+						<div class="text small gt-ellipsis" data-tooltip-content="{{.Repository.OwnerName}}/{{.Repository.Name}}">
+							{{.Repository.OwnerName}}/{{.Repository.Name}}
+						</div>
+					</div>
+					<div class="item-right tw-flex tw-items-center tw-m-1">
+						{{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}}
+							<a class="delete-dependency-button ci muted" data-id="{{.Issue.ID}}" data-type="blockedBy" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.dependency.remove_info"}}">
+								{{svg "octicon-trash" 16}}
+							</a>
+						{{end}}
+					</div>
+				</div>
+			{{end}}
+			{{if $.CanCreateIssueDependencies}}
+				{{range .BlockedByDependenciesNotPermitted}}
+					<div class="item dependency{{if .Issue.IsClosed}} is-closed{{end}} tw-flex tw-items-center tw-justify-between">
+						<div class="item-left tw-flex tw-justify-center tw-flex-col tw-flex-1 gt-ellipsis">
+							<div class="gt-ellipsis">
+								<span data-tooltip-content="{{ctx.Locale.Tr "repo.issues.dependency.no_permission.can_remove"}}">{{svg "octicon-lock" 16}}</span>
+								<span class="title" data-tooltip-content="#{{.Issue.Index}} {{RenderRefIssueTitle $.Context .DependentIssue.Title}}">
+									#{{.Issue.Index}} {{RenderRefIssueTitle $.Context .DependentIssue.Title}}
+								</span>
+							</div>
+							<div class="text small gt-ellipsis" data-tooltip-content="{{.Repository.OwnerName}}/{{.Repository.Name}}">
+								{{.Repository.OwnerName}}/{{.Repository.Name}}
+							</div>
+						</div>
+						<div class="item-right tw-flex tw-items-center tw-m-1">
+							{{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}}
+								<a class="delete-dependency-button ci muted" data-id="{{.Issue.ID}}" data-type="blocking" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.dependency.remove_info"}}">
+									{{svg "octicon-trash" 16}}
+								</a>
+							{{end}}
+						</div>
+					</div>
+				{{end}}
+			{{else if .BlockedByDependenciesNotPermitted}}
+				<div class="item tw-flex tw-items-center tw-justify-between gt-ellipsis">
+					<span>{{ctx.Locale.TrN (len .BlockedByDependenciesNotPermitted) "repo.issues.dependency.no_permission_1" "repo.issues.dependency.no_permission_n" (len .BlockedByDependenciesNotPermitted)}}</span>
+				</div>
+			{{end}}
+		</div>
+	{{end}}
+
+	{{if and .CanCreateIssueDependencies (not .Repository.IsArchived)}}
+		<div>
+			<form method="post" action="{{.Issue.Link}}/dependency/add" id="addDependencyForm">
+				{{$.CsrfTokenHtml}}
+				<div class="ui fluid action input">
+					<div class="ui search selection dropdown" id="new-dependency-drop-list" data-issue-id="{{.Issue.ID}}">
+						<input name="newDependency" type="hidden">
+						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+						<input type="text" class="search">
+						<div class="default text">{{ctx.Locale.Tr "repo.issues.dependency.add"}}</div>
+					</div>
+					<button class="ui icon button">
+						{{svg "octicon-plus"}}
+					</button>
+				</div>
+			</form>
+		</div>
+	{{end}}
+</div>
+
+{{if and .CanCreateIssueDependencies (not .Repository.IsArchived)}}
+	<input type="hidden" id="crossRepoSearch" value="{{.AllowCrossRepositoryDependencies}}">
+
+	<div class="ui g-modal-confirm modal remove-dependency">
+		<div class="header">
+			{{svg "octicon-trash"}}
+			{{ctx.Locale.Tr "repo.issues.dependency.remove_header"}}
+		</div>
+		<div class="content">
+			<form method="post" action="{{.Issue.Link}}/dependency/delete" id="removeDependencyForm">
+				{{$.CsrfTokenHtml}}
+				<input type="hidden" value="" name="removeDependencyID" id="removeDependencyID">
+				<input type="hidden" value="" name="dependencyType" id="dependencyType">
+			</form>
+			<p>{{if .Issue.IsPull}}
+				{{ctx.Locale.Tr "repo.issues.dependency.pr_remove_text"}}
+			{{else}}
+				{{ctx.Locale.Tr "repo.issues.dependency.issue_remove_text"}}
+			{{end}}</p>
+		</div>
+		{{$ModalButtonCancelText := ctx.Locale.Tr "repo.issues.dependency.cancel"}}
+		{{$ModalButtonOkText := ctx.Locale.Tr "repo.issues.dependency.remove"}}
+		{{template "base/modal_actions_confirm" (dict "." . "ModalButtonCancelText" $ModalButtonCancelText "ModalButtonOkText" $ModalButtonOkText)}}
+	</div>
+{{end}}
diff --git a/templates/repo/issue/view_content/sidebar/due_deadline.tmpl b/templates/repo/issue/view_content/sidebar/due_deadline.tmpl
new file mode 100644
index 0000000..2de836b
--- /dev/null
+++ b/templates/repo/issue/view_content/sidebar/due_deadline.tmpl
@@ -0,0 +1,41 @@
+<span class="text"><strong>{{ctx.Locale.Tr "repo.issues.due_date"}}</strong></span>
+<div class="ui form" id="deadline-loader">
+	<div class="ui negative message tw-hidden" id="deadline-err-invalid-date">
+		{{svg "octicon-x" 16 "close icon"}}
+		{{ctx.Locale.Tr "repo.issues.due_date_invalid"}}
+	</div>
+	{{if ne .Issue.DeadlineUnix 0}}
+		<p>
+			<div class="tw-flex tw-justify-between tw-items-center">
+				<div class="due-date {{if .Issue.IsOverdue}}text red{{end}}" {{if .Issue.IsOverdue}}data-tooltip-content="{{ctx.Locale.Tr "repo.issues.due_date_overdue"}}"{{end}}>
+					{{svg "octicon-calendar" 16 "tw-mr-2"}}
+					{{DateTime "long" .Issue.DeadlineUnix.FormatDate}}
+				</div>
+				<div>
+					{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
+						<a class="issue-due-edit muted" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.due_date_form_edit"}}">{{svg "octicon-pencil" 16 "tw-mr-1"}}</a>
+						<a class="issue-due-remove muted" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.due_date_form_remove"}}">{{svg "octicon-trash"}}</a>
+					{{end}}
+				</div>
+			</div>
+		</p>
+	{{else}}
+		<p>{{ctx.Locale.Tr "repo.issues.due_date_not_set"}}</p>
+	{{end}}
+
+	{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
+		<div {{if ne .Issue.DeadlineUnix 0}} class="tw-hidden"{{end}} id="deadlineForm">
+			<form class="ui fluid action input issue-due-form" action="{{AppSubUrl}}/{{PathEscape .Repository.Owner.Name}}/{{PathEscape .Repository.Name}}/issues/{{.Issue.Index}}/deadline" method="post" id="update-issue-deadline-form">
+				{{$.CsrfTokenHtml}}
+				<input required placeholder="{{ctx.Locale.Tr "repo.issues.due_date_form"}}" {{if gt .Issue.DeadlineUnix 0}}value="{{.Issue.DeadlineUnix.FormatDate}}"{{end}} type="date" name="deadlineDate" id="deadlineDate">
+				<button class="ui icon button">
+					{{if ne .Issue.DeadlineUnix 0}}
+						{{svg "octicon-pencil"}}
+					{{else}}
+						{{svg "octicon-plus"}}
+					{{end}}
+				</button>
+			</form>
+		</div>
+	{{end}}
+</div>
diff --git a/templates/repo/issue/view_content/sidebar/milestones.tmpl b/templates/repo/issue/view_content/sidebar/milestones.tmpl
new file mode 100644
index 0000000..44d9419
--- /dev/null
+++ b/templates/repo/issue/view_content/sidebar/milestones.tmpl
@@ -0,0 +1,24 @@
+<div id="milestone-section" hx-swap="morph" hx-target="this" hx-indicator="this">
+	<div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating jump select-milestone dropdown">
+		<a class="text muted flex-text-block">
+			<strong>{{ctx.Locale.Tr "repo.issues.new.milestone"}}</strong>
+			{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
+				{{svg "octicon-gear" 16 "tw-ml-1"}}
+			{{end}}
+		</a>
+		<div class="menu">
+			{{template "repo/issue/milestone/select_menu" .}}
+		</div>
+	</div>
+	<div class="ui select-milestone list">
+		<span class="no-select item {{if .Issue.Milestone}}tw-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_milestone"}}</span>
+		<div class="selected">
+			{{if .Issue.Milestone}}
+				<a class="item muted sidebar-item-link" href="{{.RepoLink}}/milestone/{{.Issue.Milestone.ID}}">
+					{{svg "octicon-milestone" 18 "tw-mr-2"}}
+					{{.Issue.Milestone.Name}}
+				</a>
+			{{end}}
+		</div>
+	</div>
+</div>
diff --git a/templates/repo/issue/view_content/sidebar/participants.tmpl b/templates/repo/issue/view_content/sidebar/participants.tmpl
new file mode 100644
index 0000000..93e2579
--- /dev/null
+++ b/templates/repo/issue/view_content/sidebar/participants.tmpl
@@ -0,0 +1,8 @@
+<span class="text"><strong>{{ctx.Locale.TrN .NumParticipants "repo.issues.num_participants_one" "repo.issues.num_participants_few" .NumParticipants}}</strong></span>
+<div class="ui list tw-flex tw-flex-wrap">
+	{{range .Participants}}
+		<a {{if gt .ID 0}}href="{{.HomeLink}}"{{end}} data-tooltip-content="{{.GetDisplayName}}">
+			{{ctx.AvatarUtils.Avatar . 28 "tw-my-0.5 tw-mr-1"}}
+		</a>
+	{{end}}
+</div>
diff --git a/templates/repo/issue/view_content/sidebar/projects.tmpl b/templates/repo/issue/view_content/sidebar/projects.tmpl
new file mode 100644
index 0000000..91d75f3
--- /dev/null
+++ b/templates/repo/issue/view_content/sidebar/projects.tmpl
@@ -0,0 +1,54 @@
+<div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating jump select-project dropdown">
+	<a class="text muted flex-text-block">
+		<strong>{{ctx.Locale.Tr "repo.issues.new.projects"}}</strong>
+		{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
+			{{svg "octicon-gear" 16 "tw-ml-1"}}
+		{{end}}
+	</a>
+	<div class="menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/projects">
+		{{if or .OpenProjects .ClosedProjects}}
+		<div class="ui icon search input">
+			<i class="icon">{{svg "octicon-search" 16}}</i>
+			<input type="text" placeholder="{{ctx.Locale.Tr "repo.issues.filter_projects"}}">
+		</div>
+		{{end}}
+		<div class="no-select item">{{ctx.Locale.Tr "repo.issues.new.clear_projects"}}</div>
+		{{if and (not .OpenProjects) (not .ClosedProjects)}}
+			<div class="disabled item">
+				{{ctx.Locale.Tr "repo.issues.new.no_items"}}
+			</div>
+		{{end}}
+		{{if .OpenProjects}}
+			<div class="divider"></div>
+			<div class="header">
+				{{ctx.Locale.Tr "repo.issues.new.open_projects"}}
+			</div>
+			{{range .OpenProjects}}
+				<a class="item muted sidebar-item-link" data-id="{{.ID}}" data-href="{{.Link ctx}}">
+					{{svg .IconName 18 "tw-mr-2"}}{{.Title}}
+				</a>
+			{{end}}
+		{{end}}
+		{{if .ClosedProjects}}
+			<div class="divider"></div>
+			<div class="header">
+				{{ctx.Locale.Tr "repo.issues.new.closed_projects"}}
+			</div>
+			{{range .ClosedProjects}}
+				<a class="item muted sidebar-item-link" data-id="{{.ID}}" data-href="{{.Link ctx}}">
+					{{svg .IconName 18 "tw-mr-2"}}{{.Title}}
+				</a>
+			{{end}}
+		{{end}}
+	</div>
+</div>
+<div class="ui select-project list">
+	<span class="no-select item {{if .Issue.Project}}tw-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_projects"}}</span>
+	<div class="selected">
+		{{if .Issue.Project}}
+			<a class="item muted sidebar-item-link" href="{{.Issue.Project.Link ctx}}">
+				{{svg .Issue.Project.IconName 18 "tw-mr-2"}}{{.Issue.Project.Title}}
+			</a>
+		{{end}}
+	</div>
+</div>
diff --git a/templates/repo/issue/view_content/sidebar/pull_maintainer_edits.tmpl b/templates/repo/issue/view_content/sidebar/pull_maintainer_edits.tmpl
new file mode 100644
index 0000000..6ec5c05
--- /dev/null
+++ b/templates/repo/issue/view_content/sidebar/pull_maintainer_edits.tmpl
@@ -0,0 +1,10 @@
+<div class="inline field">
+	<div class="ui checkbox loading-icon-2px" id="allow-edits-from-maintainers"
+			data-url="{{.Issue.Link}}"
+			data-tooltip-content="{{ctx.Locale.Tr "repo.pulls.allow_edits_from_maintainers_desc"}}"
+			data-prompt-error="{{ctx.Locale.Tr "repo.pulls.allow_edits_from_maintainers_err"}}"
+		>
+		<label><strong>{{ctx.Locale.Tr "repo.pulls.allow_edits_from_maintainers"}}</strong></label>
+		<input type="checkbox" {{if .Issue.PullRequest.AllowMaintainerEdit}}checked{{end}}>
+	</div>
+</div>
diff --git a/templates/repo/issue/view_content/sidebar/pull_review.tmpl b/templates/repo/issue/view_content/sidebar/pull_review.tmpl
new file mode 100644
index 0000000..930c2a6
--- /dev/null
+++ b/templates/repo/issue/view_content/sidebar/pull_review.tmpl
@@ -0,0 +1,45 @@
+<input id="reviewer_id" name="reviewer_id" type="hidden" value="{{.reviewer_id}}">
+<div class="ui {{if or (and (not .Reviewers) (not .TeamReviewers)) (not .CanChooseReviewer) .Repository.IsArchived}}disabled{{end}} floating jump select-reviewers-modify dropdown">
+	<a class="text tw-flex tw-items-center muted">
+		<strong>{{ctx.Locale.Tr "repo.issues.review.reviewers"}}</strong>
+		{{if and .CanChooseReviewer (not .Repository.IsArchived)}}
+			{{svg "octicon-gear" 16 "tw-ml-1"}}
+		{{end}}
+	</a>
+	<div class="filter menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/request_review">
+		{{if .Reviewers}}
+			<div class="ui icon search input">
+				<i class="icon">{{svg "octicon-search" 16}}</i>
+				<input type="text" placeholder="{{ctx.Locale.Tr "repo.issues.filter_reviewers"}}">
+			</div>
+		{{end}}
+		{{if .Reviewers}}
+			{{range .Reviewers}}
+				{{if .User}}
+					<a class="{{if not .CanChange}}ui{{end}} item {{if .Checked}}checked{{end}} {{if not .CanChange}}ban-change{{end}}" href="#" data-id="{{.ItemID}}" data-id-selector="#review_request_{{.ItemID}}" {{if not .CanChange}} data-tooltip-content="{{ctx.Locale.Tr "repo.issues.remove_request_review_block"}}"{{end}}>
+						<span class="octicon-check {{if not .Checked}}tw-invisible{{end}}">{{svg "octicon-check"}}</span>
+						<span class="text">
+							{{ctx.AvatarUtils.Avatar .User 28 "tw-mr-2"}}{{template "repo/search_name" .User}}
+						</span>
+					</a>
+				{{end}}
+			{{end}}
+		{{end}}
+		{{if .TeamReviewers}}
+			{{if .Reviewers}}
+				<div class="divider"></div>
+			{{end}}
+			{{range .TeamReviewers}}
+				{{if .Team}}
+					<a class="{{if not .CanChange}}ui{{end}} item {{if .Checked}}checked{{end}} {{if not .CanChange}}ban-change{{end}}" href="#" data-id="{{.ItemID}}" data-id-selector="#review_request_team_{{.Team.ID}}" {{if not .CanChange}} data-tooltip-content="{{ctx.Locale.Tr "repo.issues.remove_request_review_block"}}"{{end}}>
+						<span class="octicon-check {{if not .Checked}}tw-invisible{{end}}">{{svg "octicon-check" 16}}</span>
+						<span class="text">
+							{{svg "octicon-people" 16 "tw-ml-4 tw-mr-1"}}{{$.Issue.Repo.OwnerName}}/{{.Team.Name}}
+						</span>
+					</a>
+				{{end}}
+			{{end}}
+		{{end}}
+	</div>
+</div>
+{{template "repo/issue/view_content/sidebar/pull_reviewers" .}}
diff --git a/templates/repo/issue/view_content/sidebar/pull_reviewers.tmpl b/templates/repo/issue/view_content/sidebar/pull_reviewers.tmpl
new file mode 100644
index 0000000..102508f
--- /dev/null
+++ b/templates/repo/issue/view_content/sidebar/pull_reviewers.tmpl
@@ -0,0 +1,67 @@
+<div class="ui assignees list">
+			<span class="no-select item {{if or .OriginalReviews .PullReviewers}}tw-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_reviewers"}}</span>
+			<div class="selected">
+				{{range .PullReviewers}}
+					<div class="item tw-flex tw-items-center tw-py-2">
+						<div class="tw-flex tw-items-center tw-flex-1">
+							{{if .User}}
+								<a class="muted sidebar-item-link" href="{{.User.HomeLink}}">{{ctx.AvatarUtils.Avatar .User 20 "tw-mr-2"}}{{.User.GetDisplayName}}</a>
+							{{else if .Team}}
+								<span class="text">{{svg "octicon-people" 20 "tw-mr-2"}}{{$.Issue.Repo.OwnerName}}/{{.Team.Name}}</span>
+							{{end}}
+						</div>
+						<div class="tw-flex tw-items-center tw-gap-2">
+							{{if (and $.Permission.IsAdmin (or (eq .Review.Type 1) (eq .Review.Type 3)) (not $.Issue.IsClosed) (not $.Issue.PullRequest.HasMerged))}}
+								<a href="#" class="ui muted icon tw-flex tw-items-center show-modal" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.dismiss_review"}}" data-modal="#dismiss-review-modal-{{.Review.ID}}">
+									{{svg "octicon-x" 20}}
+								</a>
+								<div class="ui small modal" id="dismiss-review-modal-{{.Review.ID}}">
+									<div class="header">
+										{{ctx.Locale.Tr "repo.issues.dismiss_review"}}
+									</div>
+									<div class="content">
+										<div class="ui warning message">
+											{{ctx.Locale.Tr "repo.issues.dismiss_review_warning"}}
+										</div>
+										<form class="ui form dismiss-review-form" id="dismiss-review-{{.Review.ID}}" action="{{$.RepoLink}}/issues/dismiss_review" method="post">
+											{{$.CsrfTokenHtml}}
+											<input type="hidden" name="review_id" value="{{.Review.ID}}">
+											<div class="field">
+												<label for="message">{{ctx.Locale.Tr "action.review_dismissed_reason"}}</label>
+												<input id="message" name="message">
+											</div>
+											<div class="text right actions">
+												<button class="ui cancel button">{{ctx.Locale.Tr "settings.cancel"}}</button>
+												<button class="ui red button" type="submit">{{ctx.Locale.Tr "ok"}}</button>
+											</div>
+										</form>
+									</div>
+								</div>
+							{{end}}
+							{{if .Review.Stale}}
+								<span data-tooltip-content="{{ctx.Locale.Tr "repo.issues.is_stale"}}">
+									{{svg "octicon-hourglass" 16}}
+								</span>
+							{{end}}
+							{{if and .CanChange (or .Checked (and (not $.Issue.IsClosed) (not $.Issue.PullRequest.HasMerged)))}}
+								<a href="#" class="ui muted icon re-request-review{{if .Checked}} checked{{end}}" data-tooltip-content="{{if .Checked}}{{ctx.Locale.Tr "repo.issues.remove_request_review"}}{{else}}{{ctx.Locale.Tr "repo.issues.re_request_review"}}{{end}}" data-issue-id="{{$.Issue.ID}}" data-id="{{.ItemID}}" data-update-url="{{$.RepoLink}}/issues/request_review">{{if .Checked}}{{svg "octicon-trash"}}{{else}}{{svg "octicon-sync"}}{{end}}</a>
+							{{end}}
+							{{svg (printf "octicon-%s" .Review.Type.Icon) 16 (printf "text %s" (.Review.HTMLTypeColorName))}}
+						</div>
+					</div>
+				{{end}}
+				{{range .OriginalReviews}}
+					<div class="item tw-flex tw-items-center tw-py-2">
+						<div class="tw-flex tw-items-center tw-flex-1">
+							<a class="muted" href="{{$.Repository.OriginalURL}}" data-tooltip-content="{{ctx.Locale.Tr "repo.migrated_from_fake" $.Repository.GetOriginalURLHostname}}">
+								{{svg (MigrationIcon $.Repository.GetOriginalURLHostname) 20 "tw-mr-2"}}
+								{{.OriginalAuthor}}
+							</a>
+						</div>
+						<div class="tw-flex tw-items-center tw-gap-2">
+							{{svg (printf "octicon-%s" .Type.Icon) 16 (printf "text %s" (.HTMLTypeColorName))}}
+						</div>
+					</div>
+				{{end}}
+			</div>
+		</div>
diff --git a/templates/repo/issue/view_content/sidebar/pull_wip.tmpl b/templates/repo/issue/view_content/sidebar/pull_wip.tmpl
new file mode 100644
index 0000000..f1588b3
--- /dev/null
+++ b/templates/repo/issue/view_content/sidebar/pull_wip.tmpl
@@ -0,0 +1,11 @@
+{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .HasMerged) (not .Issue.IsClosed)}}
+	<div class="toggle-wip" data-title="{{.Issue.Title}}" data-wip-prefixes="{{JsonUtils.EncodeToString .PullRequestWorkInProgressPrefixes}}" data-update-url="{{.Issue.Link}}/title">
+		<a class="muted">
+			{{if .IsPullWorkInProgress}}
+				{{ctx.Locale.Tr "repo.pulls.ready_for_review"}} {{ctx.Locale.Tr "repo.pulls.remove_prefix" (index .PullRequestWorkInProgressPrefixes 0)}}
+			{{else}}
+				{{ctx.Locale.Tr "repo.pulls.still_in_progress"}} {{ctx.Locale.Tr "repo.pulls.add_prefix" (index .PullRequestWorkInProgressPrefixes 0)}}
+			{{end}}
+		</a>
+	</div>
+{{end}}
diff --git a/templates/repo/issue/view_content/sidebar/reference.tmpl b/templates/repo/issue/view_content/sidebar/reference.tmpl
new file mode 100644
index 0000000..bbbc099
--- /dev/null
+++ b/templates/repo/issue/view_content/sidebar/reference.tmpl
@@ -0,0 +1,7 @@
+<div class="ui equal width compact grid">
+	{{$issueReferenceLink := printf "%s#%d" .Issue.Repo.FullName .Issue.Index}}
+	<div class="row tw-items-center" data-tooltip-content="{{$issueReferenceLink}}">
+		<span class="text column truncate">{{ctx.Locale.Tr "repo.issues.reference_link" $issueReferenceLink}}</span>
+		<button class="ui two wide button column tw-p-2" data-clipboard-text="{{$issueReferenceLink}}">{{svg "octicon-copy" 14}}</button>
+	</div>
+</div>
diff --git a/templates/repo/issue/view_content/sidebar/timetracking.tmpl b/templates/repo/issue/view_content/sidebar/timetracking.tmpl
new file mode 100644
index 0000000..610600b
--- /dev/null
+++ b/templates/repo/issue/view_content/sidebar/timetracking.tmpl
@@ -0,0 +1,73 @@
+{{if and .CanUseTimetracker (not .Repository.IsArchived)}}
+	<div class="divider"></div>
+	<div class="ui timetrack">
+		<span class="text"><strong>{{ctx.Locale.Tr "repo.issues.tracker"}}</strong></span>
+		<div class="tw-mt-2">
+			<form method="post" action="{{.Issue.Link}}/times/stopwatch/toggle" id="toggle_stopwatch_form">
+				{{$.CsrfTokenHtml}}
+			</form>
+			<form method="post" action="{{.Issue.Link}}/times/stopwatch/cancel" id="cancel_stopwatch_form">
+				{{$.CsrfTokenHtml}}
+			</form>
+			{{if $.IsStopwatchRunning}}
+				<button class="ui fluid button issue-stop-time">
+					{{svg "octicon-stopwatch" 16 "tw-mr-2"}}
+					{{ctx.Locale.Tr "repo.issues.stop_tracking"}}
+				</button>
+				<button class="ui fluid button issue-cancel-time tw-mt-2">
+					{{svg "octicon-trash" 16 "tw-mr-2"}}
+					{{ctx.Locale.Tr "repo.issues.cancel_tracking"}}
+				</button>
+			{{else}}
+				{{if .HasUserStopwatch}}
+					<div class="ui warning message">
+						{{ctx.Locale.Tr "repo.issues.tracking_already_started" .OtherStopwatchURL}}
+					</div>
+				{{end}}
+				<button class="ui fluid button issue-start-time" data-tooltip-content='{{ctx.Locale.Tr "repo.issues.start_tracking"}}'>
+					{{svg "octicon-stopwatch" 16 "tw-mr-2"}}
+					{{ctx.Locale.Tr "repo.issues.start_tracking_short"}}
+				</button>
+				<div class="ui mini modal issue-start-time-modal">
+					<div class="header">{{ctx.Locale.Tr "repo.issues.add_time"}}</div>
+					<div class="content">
+						<form method="post" id="add_time_manual_form" action="{{.Issue.Link}}/times/add" class="ui input fluid tw-gap-2">
+							{{$.CsrfTokenHtml}}
+							<input placeholder='{{ctx.Locale.Tr "repo.issues.add_time_hours"}}' type="number" name="hours">
+							<input placeholder='{{ctx.Locale.Tr "repo.issues.add_time_minutes"}}' type="number" name="minutes" class="ui compact">
+						</form>
+					</div>
+					<div class="actions">
+						<button class="ui primary approve button">{{ctx.Locale.Tr "repo.issues.add_time_short"}}</button>
+						<button class="ui cancel button">{{ctx.Locale.Tr "repo.issues.add_time_cancel"}}</button>
+					</div>
+				</div>
+				<button class="ui fluid button issue-add-time tw-mt-2" data-tooltip-content='{{ctx.Locale.Tr "repo.issues.add_time"}}'>
+					{{svg "octicon-plus" 16 "tw-mr-2"}}
+					{{ctx.Locale.Tr "repo.issues.add_time_short"}}
+				</button>
+			{{end}}
+		</div>
+	</div>
+{{end}}
+{{if .WorkingUsers}}
+	<div class="divider"></div>
+	<div class="ui comments">
+		<span class="text"><strong>{{ctx.Locale.Tr "repo.issues.time_spent_from_all_authors" ($.Issue.TotalTrackedTime | Sec2Time)}}</strong></span>
+		<div>
+			{{range $user, $trackedtime := .WorkingUsers}}
+				<div class="comment tw-mt-2">
+					<a class="avatar">
+						{{ctx.AvatarUtils.Avatar $user}}
+					</a>
+					<div class="content">
+						{{template "shared/user/authorlink" $user}}
+						<div class="text">
+							{{$trackedtime|Sec2Time}}
+						</div>
+					</div>
+				</div>
+			{{end}}
+		</div>
+	</div>
+{{end}}
diff --git a/templates/repo/issue/view_content/sidebar/watch.tmpl b/templates/repo/issue/view_content/sidebar/watch.tmpl
new file mode 100644
index 0000000..ee14168
--- /dev/null
+++ b/templates/repo/issue/view_content/sidebar/watch.tmpl
@@ -0,0 +1,6 @@
+<div class="ui watching">
+	<span class="text"><strong>{{ctx.Locale.Tr "notification.notifications"}}</strong></span>
+	<div class="tw-mt-2">
+		{{template "repo/issue/view_content/sidebar/watching" .}}
+	</div>
+</div>
diff --git a/templates/repo/issue/view_content/sidebar/watching.tmpl b/templates/repo/issue/view_content/sidebar/watching.tmpl
new file mode 100644
index 0000000..d3d7594
--- /dev/null
+++ b/templates/repo/issue/view_content/sidebar/watching.tmpl
@@ -0,0 +1,19 @@
+<form hx-boost="true" hx-sync="this:replace" hx-target="this" method="post" action="{{.Issue.Link}}/watch"
+	{{if not $.IsSigned}}
+		{{if $.Issue.IsPull}}
+			data-tooltip-content="{{ctx.Locale.Tr "repo.subscribe.pull.guest.tooltip"}}"
+		{{else}}
+			data-tooltip-content="{{ctx.Locale.Tr "repo.subscribe.issue.guest.tooltip"}}"
+		{{end}}
+	{{end}}>
+	<input type="hidden" name="watch" value="{{if $.IssueWatch.IsWatching}}0{{else}}1{{end}}">
+	<button class="fluid ui button {{if not $.IsSigned}}disabled{{end}}">
+		{{if $.IssueWatch.IsWatching}}
+			{{svg "octicon-mute" 16 "tw-mr-2"}}
+			{{ctx.Locale.Tr "repo.issues.unsubscribe"}}
+		{{else}}
+			{{svg "octicon-unmute" 16 "tw-mr-2"}}
+			{{ctx.Locale.Tr "repo.issues.subscribe"}}
+		{{end}}
+	</button>
+</form>
diff --git a/templates/repo/issue/view_content/update_branch_by_merge.tmpl b/templates/repo/issue/view_content/update_branch_by_merge.tmpl
new file mode 100644
index 0000000..adce052
--- /dev/null
+++ b/templates/repo/issue/view_content/update_branch_by_merge.tmpl
@@ -0,0 +1,37 @@
+{{if and (gt $.Issue.PullRequest.CommitsBehind 0) (not $.Issue.IsClosed) (not $.Issue.PullRequest.IsChecking) (not $.IsPullFilesConflicted) (not $.IsPullRequestBroken)}}
+	<div class="divider"></div>
+	<div class="item item-section">
+		<div class="item-section-left flex-text-inline">
+			{{svg "octicon-alert"}}
+			{{ctx.Locale.Tr "repo.pulls.outdated_with_base_branch"}}
+		</div>
+		<div class="item-section-right">
+			{{if and $.UpdateAllowed $.UpdateByRebaseAllowed}}
+				<div class="tw-inline-block">
+					<div class="ui buttons update-button">
+						<button class="ui button" data-do="{{$.Link}}/update" data-redirect="{{$.Link}}">
+							<span class="button-text">
+								{{ctx.Locale.Tr "repo.pulls.update_branch"}}
+							</span>
+						</button>
+						<div class="ui dropdown icon button">
+							{{svg "octicon-triangle-down"}}
+							<div class="menu">
+								<a class="item active selected" data-do="{{$.Link}}/update">{{ctx.Locale.Tr "repo.pulls.update_branch"}}</a>
+								<a class="item" data-do="{{$.Link}}/update?style=rebase">{{ctx.Locale.Tr "repo.pulls.update_branch_rebase"}}</a>
+							</div>
+						</div>
+					</div>
+				</div>
+			{{end}}
+			{{if and $.UpdateAllowed (not $.UpdateByRebaseAllowed)}}
+				<form action="{{$.Link}}/update" method="post" class="ui update-branch-form">
+					{{$.CsrfTokenHtml}}
+					<button class="ui compact button">
+						<span class="ui text">{{ctx.Locale.Tr "repo.pulls.update_branch"}}</span>
+					</button>
+				</form>
+			{{end}}
+		</div>
+	</div>
+{{end}}