aboutsummaryrefslogtreecommitdiffstats
path: root/routers/web/repo/pull.go
diff options
context:
space:
mode:
Diffstat (limited to 'routers/web/repo/pull.go')
-rw-r--r--routers/web/repo/pull.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
index 32d9a65cbd..b324ae4d2e 100644
--- a/routers/web/repo/pull.go
+++ b/routers/web/repo/pull.go
@@ -340,7 +340,7 @@ func PrepareMergedViewPullInfo(ctx *context.Context, issue *models.Issue) *git.C
}
if commitSHA != "" {
// Get immediate parent of the first commit in the patch, grab history back
- parentCommit, err = git.NewCommand(ctx, "rev-list", "-1", "--skip=1", commitSHA).RunInDir(ctx.Repo.GitRepo.Path)
+ parentCommit, _, err = git.NewCommand(ctx, "rev-list", "-1", "--skip=1", commitSHA).RunStdString(&git.RunOpts{Dir: ctx.Repo.GitRepo.Path})
if err == nil {
parentCommit = strings.TrimSpace(parentCommit)
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 05:59:37 +0000
href='#n107'>107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 
{{range .Issue.Comments}}
	{{ $createdStr:= TimeSinceUnix .CreatedUnix $.Lang }}

	<!-- 0 = COMMENT, 1 = REOPEN, 2 = CLOSE, 3 = ISSUE_REF, 4 = COMMIT_REF, 5 = COMMENT_REF, 6 = PULL_REF, 7 = COMMENT_LABEL, 12 = START_TRACKING, 13 = STOP_TRACKING, 14 = ADD_TIME_MANUAL, 16 = ADDED_DEADLINE, 17 = MODIFIED_DEADLINE, 18 = REMOVED_DEADLINE -->
	{{if eq .Type 0}}
		<div class="comment" id="{{.HashTag}}">
			<a class="avatar" {{if gt .Poster.ID 0}}href="{{.Poster.HomeLink}}"{{end}}>
				<img src="{{.Poster.RelAvatarLink}}">
			</a>
			<div class="content">
				<div class="ui top attached header">
					<span class="text grey"><a {{if gt .Poster.ID 0}}href="{{.Poster.HomeLink}}"{{end}}>{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.commented_at" .HashTag $createdStr | Safe}}</span>
					<div class="ui right actions">
						{{if gt .ShowTag 0}}
							<div class="item tag">
								{{if eq .ShowTag 1}}
									{{$.i18n.Tr "repo.issues.poster"}}
								{{else if eq .ShowTag 2}}
									{{$.i18n.Tr "repo.issues.collaborator"}}
								{{else if eq .ShowTag 3}}
									{{$.i18n.Tr "repo.issues.owner"}}
								{{end}}
							</div>
						{{end}}
						{{template "repo/issue/view_content/add_reaction" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.RepoLink .ID) }}
						{{if or $.IsRepositoryAdmin (eq .Poster.ID $.SignedUserID)}}
							<div class="item action">
								<a class="edit-content" href="#"><i class="octicon octicon-pencil"></i></a>
								<a class="delete-comment" href="#" data-comment-id={{.HashTag}} data-url="{{$.RepoLink}}/comments/{{.ID}}/delete" data-locale="{{$.i18n.Tr "repo.issues.delete_comment_confirm"}}"><i class="octicon octicon-x"></i></a>
							</div>
						{{end}}
					</div>
				</div>
				<div class="ui attached segment">
					<div class="render-content markdown has-emoji">
						{{if .RenderedContent}}
							{{.RenderedContent|Str2html}}
						{{else}}
							<span class="no-content">{{$.i18n.Tr "repo.issues.no_content"}}</span>
						{{end}}
					</div>
					<div class="raw-content hide">{{.Content}}</div>
					<div class="edit-content-zone hide" data-write="issuecomment-{{.ID}}-write" data-preview="issuecomment-{{.ID}}-preview" data-update-url="{{$.RepoLink}}/comments/{{.ID}}" data-context="{{$.RepoLink}}"></div>
				</div>
				{{$reactions := .Reactions.GroupByType}}
				{{if $reactions}}
					<div class="ui attached segment reactions">
						{{template "repo/issue/view_content/reactions" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.RepoLink .ID) "Reactions" $reactions }}
					</div>
				{{end}}
				{{if .Attachments}}
					<div class="ui bottom attached segment">
						<div class="ui small images">
							{{range .Attachments}}
								<a target="_blank" rel="noopener noreferrer" href="{{AppSubUrl}}/attachments/{{.UUID}}">
									{{if FilenameIsImage .Name}}
										<img class="ui image" src="{{AppSubUrl}}/attachments/{{.UUID}}" title='{{$.i18n.Tr "repo.issues.attachment.open_tab" .Name}}'>
									{{else}}
										<span class="ui image octicon octicon-desktop-download" title='{{$.i18n.Tr "repo.issues.attachment.download" .Name}}'></span>
									{{end}}
								</a>
							{{end}}
						</div>
					</div>
				{{end}}
			</div>
		</div>

	{{else if eq .Type 1}}
		<div class="event">
			<span class="octicon octicon-primitive-dot"></span>
			<a class="ui avatar image" href="{{.Poster.HomeLink}}">
				<img src="{{.Poster.RelAvatarLink}}">
			</a>
			<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.reopened_at" .EventTag $createdStr | Safe}}</span>
		</div>
	{{else if eq .Type 2}}
		<div class="event">
			<span class="octicon octicon-circle-slash"></span>
			<a class="ui avatar image" href="{{.Poster.HomeLink}}">
				<img src="{{.Poster.RelAvatarLink}}">
			</a>
			<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.closed_at" .EventTag $createdStr | Safe}}</span>
		</div>
	{{else if eq .Type 4}}
		<div class="event">
			<span class="octicon octicon-bookmark"></span>
			<a class="ui avatar image" href="{{.Poster.HomeLink}}">
				<img src="{{.Poster.RelAvatarLink}}">
			</a>
			<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.commit_ref_at" .EventTag $createdStr | Safe}}</span>

			<div class="detail">
				<span class="octicon octicon-git-commit"></span>
				<span class="text grey">{{.Content | Str2html}}</span>
			</div>
		</div>
	{{else if eq .Type 7}}
		{{if .Label}}
			<div class="event">
				<span class="octicon octicon-primitive-dot"></span>
				<a class="ui avatar image" href="{{.Poster.HomeLink}}">
					<img src="{{.Poster.RelAvatarLink}}">
				</a>
				<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a>
				{{if .Content}}{{$.i18n.Tr "repo.issues.add_label_at" .Label.ForegroundColor .Label.Color (.Label.Name|Escape) $createdStr | Safe}}{{else}}{{$.i18n.Tr "repo.issues.remove_label_at" .Label.ForegroundColor .Label.Color (.Label.Name|Escape) $createdStr | Safe}}{{end}}</span>
			</div>
		{{end}}
	{{else if eq .Type 8}}
		<div class="event">
			<span class="octicon octicon-primitive-dot"></span>
			<a class="ui avatar image" href="{{.Poster.HomeLink}}">
				<img src="{{.Poster.RelAvatarLink}}">
			</a>
			<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a>
			{{if gt .OldMilestoneID 0}}{{if gt .MilestoneID 0}}{{$.i18n.Tr "repo.issues.change_milestone_at" (.OldMilestone.Name|Escape) (.Milestone.Name|Escape) $createdStr | Safe}}{{else}}{{$.i18n.Tr "repo.issues.remove_milestone_at" (.OldMilestone.Name|Escape) $createdStr | Safe}}{{end}}{{else if gt .MilestoneID 0}}{{$.i18n.Tr "repo.issues.add_milestone_at" (.Milestone.Name|Escape) $createdStr | Safe}}{{end}}</span>
		</div>
	{{else if eq .Type 9}}
		<div class="event">
			<span class="octicon octicon-primitive-dot"></span>
			{{if gt .AssigneeID 0}}
				{{if .RemovedAssignee}}
					<a class="ui avatar image" href="{{.Assignee.HomeLink}}">
						<img src="{{.Assignee.RelAvatarLink}}">
					</a>
					<span class="text grey">
						<a href="{{.Assignee.HomeLink}}">{{.Assignee.Name}}</a>
						{{$.i18n.Tr "repo.issues.remove_assignee_at" $createdStr | Safe}}
					</span>
				{{else}}
					<a class="ui avatar image" href="{{.Assignee.HomeLink}}">
						<img src="{{.Assignee.RelAvatarLink}}">
					</a>
					<span class="text grey">
						<a href="{{.Assignee.HomeLink}}">{{.Assignee.Name}}</a>
						{{if eq .Poster.ID .AssigneeID}}
							{{$.i18n.Tr "repo.issues.self_assign_at" $createdStr | Safe}}
						{{else}}
							{{$.i18n.Tr "repo.issues.add_assignee_at" .Poster.Name $createdStr | Safe}}
						{{end}}
					</span>
				{{end}}
			{{end}}
		</div>
	{{else if eq .Type 10}}
		<div class="event">
			<span class="octicon octicon-primitive-dot"></span>
			<a class="ui avatar image" href="{{.Poster.HomeLink}}">
				<img src="{{.Poster.RelAvatarLink}}">
			</a>
			<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a>
			{{$.i18n.Tr "repo.issues.change_title_at" (.OldTitle|Escape) (.NewTitle|Escape) $createdStr | Safe}}
			</span>
		</div>
	{{else if eq .Type 11}}
		<div class="event">
			<span class="octicon octicon-primitive-dot"></span>
			<a class="ui avatar image" href="{{.Poster.HomeLink}}">
				<img src="{{.Poster.RelAvatarLink}}">
			</a>
			<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a>
			{{$.i18n.Tr "repo.issues.delete_branch_at" (.CommitSHA|Escape) $createdStr | Safe}}
			</span>
		</div>
    {{else if eq .Type 12}}
		<div class="event">
			<span class="octicon octicon-primitive-dot"></span>
			<a class="ui avatar image" href="{{.Poster.HomeLink}}">
				<img src="{{.Poster.RelAvatarLink}}">
			</a>
			<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.start_tracking_history"  $createdStr | Safe}}</span>
		</div>
	{{else if eq .Type 13}}
		<div class="event">
			<span class="octicon octicon-primitive-dot"></span>
			<a class="ui avatar image" href="{{.Poster.HomeLink}}">
				<img src="{{.Poster.RelAvatarLink}}">
			</a>
			<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.stop_tracking_history"  $createdStr | Safe}}</span>

			<div class="detail">
				<span class="octicon octicon-clock"></span>
				<span class="text grey">{{.Content}}</span>
			</div>
		</div>
	{{else if eq .Type 14}}
		<div class="event">
			<span class="octicon octicon-primitive-dot"></span>
			<a class="ui avatar image" href="{{.Poster.HomeLink}}">
				<img src="{{.Poster.RelAvatarLink}}">
			</a>
			<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.add_time_history"  $createdStr | Safe}}</span>
			<div class="detail">
				<span class="octicon octicon-clock"></span>
				<span class="text grey">{{.Content}}</span>
			</div>
		</div>
	{{else if eq .Type 15}}
		<div class="event">
			<span class="octicon octicon-primitive-dot"></span>
			<a class="ui avatar image" href="{{.Poster.HomeLink}}">
				<img src="{{.Poster.RelAvatarLink}}">
			</a>
			<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.cancel_tracking_history"  $createdStr | Safe}}</span>
		</div>
	{{else if eq .Type 16}}
		<div class="event">
			<span class="octicon octicon-primitive-dot"></span>
			<a class="ui avatar image" href="{{.Poster.HomeLink}}">
				<img src="{{.Poster.RelAvatarLink}}">
			</a>
			<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a>
			{{$.i18n.Tr "repo.issues.due_date_added" .Content $createdStr | Safe}}
			</span>
		</div>
	{{else if eq .Type 17}}
		<div class="event">
			<span class="octicon octicon-primitive-dot"></span>
			<a class="ui avatar image" href="{{.Poster.HomeLink}}">
				<img src="{{.Poster.RelAvatarLink}}">
			</a>
			<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a>
			{{$.i18n.Tr "repo.issues.due_date_modified" (.Content | ParseDeadline) $createdStr | Safe}}
			</span>
		</div>
	{{else if eq .Type 18}}
		<div class="event">
			<span class="octicon octicon-primitive-dot"></span>
			<a class="ui avatar image" href="{{.Poster.HomeLink}}">
				<img src="{{.Poster.RelAvatarLink}}">
			</a>
			<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a>
			{{$.i18n.Tr "repo.issues.due_date_remove" .Content $createdStr | Safe}}
			</span>
		</div>
	{{end}}
{{end}}