8354670708
This PR contains multiple fixes. The most important of which is:
* Prevent hang in git cat-file if the repository is not a valid repository
Unfortunately it appears that if git cat-file is run in an invalid
repository it will hang until stdin is closed. This will result in
deadlocked /pulls pages and dangling git cat-file calls if a broken
repository is tried to be reviewed or pulls exists for a broken
repository.
Fix #14734
Fix #9271
Fix #16113
Otherwise there are a few small other fixes included which this PR was initially intending to fix:
* Fix panic on partial compares due to missing PullRequestWorkInProgressPrefixes
* Fix links on pulls pages due to regression from #17551 - by making most /issues routes match /pulls too - Fix #17983
* Fix links on feeds pages due to another regression from #17551 but also fix issue with syncing tags - Fix #17943
* Add missing locale entries for oauth group claims
* Prevent NPEs if ColorFormat is called on nil users, repos or teams.
127 lines
7.4 KiB
Handlebars
127 lines
7.4 KiB
Handlebars
{{range .Feeds}}
|
|
<div class="news">
|
|
<div class="ui left">
|
|
{{avatarByAction .}}
|
|
</div>
|
|
<div class="ui grid">
|
|
<div class="ui fourteen wide column">
|
|
<div class="{{if or (eq .GetOpType 5) (eq .GetOpType 18)}}push news{{end}}">
|
|
<p>
|
|
{{if gt .ActUser.ID 0}}
|
|
<a href="{{AppSubUrl}}/{{.GetActUserName | PathEscape}}" title="{{.GetDisplayNameTitle}}">{{.GetDisplayName}}</a>
|
|
{{else}}
|
|
{{.ShortActUserName}}
|
|
{{end}}
|
|
{{if eq .GetOpType 1}}
|
|
{{$.i18n.Tr "action.create_repo" (.GetRepoLink|Escape) (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 2}}
|
|
{{$.i18n.Tr "action.rename_repo" (.GetContent|Escape) (.GetRepoLink|Escape) (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 5}}
|
|
{{if .Content}}
|
|
{{$.i18n.Tr "action.commit_repo" (.GetRepoLink|Escape) (.GetRefLink|Escape) (Escape .GetBranch) (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else}}
|
|
{{$.i18n.Tr "action.create_branch" (.GetRepoLink|Escape) (.GetRefLink|Escape) (Escape .GetBranch) (.ShortRepoPath|Escape) | Str2html}}
|
|
{{end}}
|
|
{{else if eq .GetOpType 6}}
|
|
{{ $index := index .GetIssueInfos 0}}
|
|
{{$.i18n.Tr "action.create_issue" ((printf "%s/issues/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 7}}
|
|
{{ $index := index .GetIssueInfos 0}}
|
|
{{$.i18n.Tr "action.create_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 8}}
|
|
{{$.i18n.Tr "action.transfer_repo" .GetContent (.GetRepoLink|Escape) (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 9}}
|
|
{{$.i18n.Tr "action.push_tag" (.GetRepoLink|Escape) (.GetRefLink|Escape) (.GetTag|Escape) (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 10}}
|
|
{{ $index := index .GetIssueInfos 0}}
|
|
{{$.i18n.Tr "action.comment_issue" ((printf "%s/issues/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 11}}
|
|
{{ $index := index .GetIssueInfos 0}}
|
|
{{$.i18n.Tr "action.merge_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 12}}
|
|
{{ $index := index .GetIssueInfos 0}}
|
|
{{$.i18n.Tr "action.close_issue" ((printf "%s/issues/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 13}}
|
|
{{ $index := index .GetIssueInfos 0}}
|
|
{{$.i18n.Tr "action.reopen_issue" ((printf "%s/issues/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 14}}
|
|
{{ $index := index .GetIssueInfos 0}}
|
|
{{$.i18n.Tr "action.close_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 15}}
|
|
{{ $index := index .GetIssueInfos 0}}
|
|
{{$.i18n.Tr "action.reopen_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 16}}
|
|
{{ $index := index .GetIssueInfos 0}}
|
|
{{$.i18n.Tr "action.delete_tag" (.GetRepoLink|Escape) (.GetTag|Escape) (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 17}}
|
|
{{ $index := index .GetIssueInfos 0}}
|
|
{{$.i18n.Tr "action.delete_branch" (.GetRepoLink|Escape) (.GetBranch|Escape) (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 18}}
|
|
{{$.i18n.Tr "action.mirror_sync_push" (.GetRepoLink|Escape) (.GetRefLink|Escape) (.GetBranch|Escape) (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 19}}
|
|
{{$.i18n.Tr "action.mirror_sync_create" (.GetRepoLink|Escape) (.GetRefLink|Escape) (.GetBranch|Escape) (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 20}}
|
|
{{$.i18n.Tr "action.mirror_sync_delete" (.GetRepoLink|Escape) (.GetBranch|Escape) (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 21}}
|
|
{{ $index := index .GetIssueInfos 0}}
|
|
{{$.i18n.Tr "action.approve_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 22}}
|
|
{{ $index := index .GetIssueInfos 0}}
|
|
{{$.i18n.Tr "action.reject_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 23}}
|
|
{{ $index := index .GetIssueInfos 0}}
|
|
{{$.i18n.Tr "action.comment_pull" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 24}}
|
|
{{ $linkText := .Content | RenderEmoji }}
|
|
{{$.i18n.Tr "action.publish_release" (.GetRepoLink|Escape) ((printf "%s/release/tag/%s" .GetRepoLink .GetTag)|Escape) (.ShortRepoPath|Escape) $linkText | Str2html}}
|
|
{{else if eq .GetOpType 25}}
|
|
{{ $index := index .GetIssueInfos 0}}
|
|
{{ $reviewer := index .GetIssueInfos 1}}
|
|
{{$.i18n.Tr "action.review_dismissed" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) $reviewer | Str2html}}
|
|
{{end}}
|
|
</p>
|
|
{{if or (eq .GetOpType 5) (eq .GetOpType 18)}}
|
|
<div class="content">
|
|
<ul>
|
|
{{ $push := ActionContent2Commits .}}
|
|
{{ $repoLink := .GetRepoLink}}
|
|
{{range $push.Commits}}
|
|
{{ $commitLink := printf "%s/commit/%s" $repoLink .Sha1}}
|
|
<li>
|
|
{{avatarHTML ($push.AvatarLink .AuthorEmail) 16 "mr-2" .AuthorName}}
|
|
<a class="commit-id mr-2" href="{{$commitLink}}">{{ShortSha .Sha1}}</a>
|
|
<span class="text truncate light grey">
|
|
{{RenderCommitMessage .Message $repoLink $.ComposeMetas}}
|
|
</span>
|
|
</li>
|
|
{{end}}
|
|
{{if and (gt $push.Len 1) $push.CompareURL}}<li><a href="{{AppSubUrl}}/{{$push.CompareURL}}">{{$.i18n.Tr "action.compare_commits" $push.Len}} »</a></li>{{end}}
|
|
</ul>
|
|
</div>
|
|
{{else if eq .GetOpType 6}}
|
|
<span class="text truncate issue title">{{index .GetIssueInfos 1 | RenderEmoji}}</span>
|
|
{{else if eq .GetOpType 7}}
|
|
<span class="text truncate issue title">{{index .GetIssueInfos 1 | RenderEmoji}}</span>
|
|
{{else if or (eq .GetOpType 10) (eq .GetOpType 21) (eq .GetOpType 22) (eq .GetOpType 23)}}
|
|
<a href="{{.GetCommentLink}}" class="text truncate issue title">{{.GetIssueTitle | RenderEmoji}}</a>
|
|
{{$comment := index .GetIssueInfos 1}}
|
|
{{if gt (len $comment) 0}}<p class="text light grey">{{$comment | RenderEmoji}}</p>{{end}}
|
|
{{else if eq .GetOpType 11}}
|
|
<p class="text light grey">{{index .GetIssueInfos 1}}</p>
|
|
{{else if or (eq .GetOpType 12) (eq .GetOpType 13) (eq .GetOpType 14) (eq .GetOpType 15)}}
|
|
<span class="text truncate issue title">{{.GetIssueTitle | RenderEmoji}}</span>
|
|
{{else if eq .GetOpType 25}}
|
|
<p class="text light grey">{{$.i18n.Tr "action.review_dismissed_reason"}}</p>
|
|
<p class="text light grey">{{index .GetIssueInfos 2 | RenderEmoji}}</p>
|
|
{{end}}
|
|
<p class="text italic light grey">{{TimeSince .GetCreate $.i18n.Lang}}</p>
|
|
</div>
|
|
</div>
|
|
<div class="ui two wide right aligned column">
|
|
<span class="text grey">{{svg (printf "octicon-%s" (ActionIcon .GetOpType)) 32}}</span>
|
|
</div>
|
|
</div>
|
|
<div class="ui divider"></div>
|
|
</div>
|
|
{{end}}
|