2019-06-07 14:29:29 -06:00
|
|
|
{{template "base/head" .}}
|
2023-02-01 15:56:10 -07:00
|
|
|
<div role="main" aria-label="{{.Title}}" class="page-content repository diff {{if .PageIsComparePull}}compare pull{{end}}">
|
2019-06-07 14:29:29 -06:00
|
|
|
{{template "repo/header" .}}
|
2023-05-08 23:21:03 -06:00
|
|
|
{{$showDiffBox := false}}
|
2023-11-23 08:52:57 -07:00
|
|
|
<div class="ui container fluid padded">
|
2021-05-07 15:10:05 -06:00
|
|
|
<h2 class="ui header">
|
|
|
|
{{if and $.PageIsComparePull $.IsSigned (not .Repository.IsArchived)}}
|
2023-09-25 02:56:50 -06:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.compare_changes"}}
|
|
|
|
<div class="sub header">{{ctx.Locale.Tr "repo.pulls.compare_changes_desc"}}</div>
|
2022-08-31 09:58:54 -06:00
|
|
|
{{else}}
|
2023-09-25 02:56:50 -06:00
|
|
|
{{ctx.Locale.Tr "action.compare_commits_general"}}
|
2022-08-31 09:58:54 -06:00
|
|
|
{{end}}
|
2021-05-07 15:10:05 -06:00
|
|
|
</h2>
|
2022-08-31 09:58:54 -06:00
|
|
|
{{$BaseCompareName := $.BaseName -}}
|
2021-05-07 15:10:05 -06:00
|
|
|
{{- $HeadCompareName := $.HeadRepo.OwnerName -}}
|
|
|
|
{{- if and (eq $.BaseName $.HeadRepo.OwnerName) (ne $.Repository.Name $.HeadRepo.Name) -}}
|
|
|
|
{{- $HeadCompareName = printf "%s/%s" $.HeadRepo.OwnerName $.HeadRepo.Name -}}
|
|
|
|
{{- end -}}
|
|
|
|
{{- $OwnForkCompareName := "" -}}
|
|
|
|
{{- if .OwnForkRepo -}}
|
|
|
|
{{- $OwnForkCompareName = .OwnForkRepo.OwnerName -}}
|
|
|
|
{{- end -}}
|
|
|
|
{{- $RootRepoCompareName := "" -}}
|
|
|
|
{{- if .RootRepo -}}
|
|
|
|
{{- $RootRepoCompareName = .RootRepo.OwnerName -}}
|
|
|
|
{{- if eq $.HeadRepo.OwnerName .RootRepo.OwnerName -}}
|
2021-03-15 19:36:34 -06:00
|
|
|
{{- $HeadCompareName = printf "%s/%s" $.HeadRepo.OwnerName $.HeadRepo.Name -}}
|
|
|
|
{{- end -}}
|
2021-05-07 15:10:05 -06:00
|
|
|
{{- end -}}
|
|
|
|
<div class="ui segment choose branch">
|
Migrate margin and padding helpers to tailwind (#30043)
This will conclude the refactor of 1:1 class replacements to tailwind,
except `gt-hidden`. Commands ran:
```bash
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-0#tw-$1$2-0#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-1#tw-$1$2-0.5#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-2#tw-$1$2-1#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-3#tw-$1$2-2#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-4#tw-$1$2-4#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-5#tw-$1$2-8#g' {web_src/js,templates,routers,services}/**/*
```
2024-03-24 10:42:49 -06:00
|
|
|
<a class="tw-mr-2" href="{{$.HeadRepo.Link}}/compare/{{PathEscapeSegments $.HeadBranch}}{{$.CompareSeparator}}{{if not $.PullRequestCtx.SameRepo}}{{PathEscape $.BaseName}}/{{PathEscape $.Repository.Name}}:{{end}}{{PathEscapeSegments $.BaseBranch}}" title="{{ctx.Locale.Tr "repo.pulls.switch_head_and_base"}}">{{svg "octicon-git-compare"}}</a>
|
2024-03-14 21:43:10 -06:00
|
|
|
<div class="ui floating filter dropdown" data-no-results="{{ctx.Locale.Tr "no_results_found"}}">
|
2021-05-07 15:10:05 -06:00
|
|
|
<div class="ui basic small button">
|
2023-09-25 06:42:40 -06:00
|
|
|
<span class="text">{{if $.PageIsComparePull}}{{ctx.Locale.Tr "repo.pulls.compare_base"}}{{else}}{{ctx.Locale.Tr "repo.compare.compare_base"}}{{end}}: {{$BaseCompareName}}:{{$.BaseBranch}}</span>
|
2021-05-07 15:10:05 -06:00
|
|
|
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
|
|
|
|
</div>
|
|
|
|
<div class="menu">
|
|
|
|
<div class="ui icon search input">
|
2023-06-14 10:40:15 -06:00
|
|
|
<i class="icon">{{svg "octicon-filter" 16}}</i>
|
2023-09-25 02:56:50 -06:00
|
|
|
<input name="search" placeholder="{{ctx.Locale.Tr "repo.filter_branch_and_tag"}}...">
|
2019-06-07 14:29:29 -06:00
|
|
|
</div>
|
2021-05-07 15:10:05 -06:00
|
|
|
<div class="header">
|
|
|
|
<div class="ui grid">
|
|
|
|
<div class="two column row">
|
|
|
|
<a class="reference column" href="#" data-target=".base-branch-list">
|
|
|
|
<span class="text black">
|
Migrate margin and padding helpers to tailwind (#30043)
This will conclude the refactor of 1:1 class replacements to tailwind,
except `gt-hidden`. Commands ran:
```bash
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-0#tw-$1$2-0#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-1#tw-$1$2-0.5#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-2#tw-$1$2-1#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-3#tw-$1$2-2#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-4#tw-$1$2-4#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-5#tw-$1$2-8#g' {web_src/js,templates,routers,services}/**/*
```
2024-03-24 10:42:49 -06:00
|
|
|
{{svg "octicon-git-branch" 16 "tw-mr-1"}}{{ctx.Locale.Tr "repo.branches"}}
|
2021-05-07 15:10:05 -06:00
|
|
|
</span>
|
|
|
|
</a>
|
|
|
|
<a class="reference column" href="#" data-target=".base-tag-list">
|
|
|
|
<span class="text black">
|
Migrate margin and padding helpers to tailwind (#30043)
This will conclude the refactor of 1:1 class replacements to tailwind,
except `gt-hidden`. Commands ran:
```bash
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-0#tw-$1$2-0#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-1#tw-$1$2-0.5#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-2#tw-$1$2-1#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-3#tw-$1$2-2#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-4#tw-$1$2-4#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-5#tw-$1$2-8#g' {web_src/js,templates,routers,services}/**/*
```
2024-03-24 10:42:49 -06:00
|
|
|
{{svg "octicon-tag" 16 "tw-mr-1"}}{{ctx.Locale.Tr "repo.tags"}}
|
2021-05-07 15:10:05 -06:00
|
|
|
</span>
|
|
|
|
</a>
|
|
|
|
</div>
|
2019-06-07 14:29:29 -06:00
|
|
|
</div>
|
2021-05-07 15:10:05 -06:00
|
|
|
</div>
|
|
|
|
<div class="scrolling menu reference-list-menu base-branch-list">
|
|
|
|
{{range .Branches}}
|
2021-11-16 11:18:25 -07:00
|
|
|
<div class="item {{if eq $.BaseBranch .}}selected{{end}}" data-url="{{$.RepoLink}}/compare/{{PathEscapeSegments .}}{{$.CompareSeparator}}{{if not $.PullRequestCtx.SameRepo}}{{PathEscape $.HeadUser.Name}}/{{PathEscape $.HeadRepo.Name}}:{{end}}{{PathEscapeSegments $.HeadBranch}}">{{$BaseCompareName}}:{{.}}</div>
|
2021-05-07 15:10:05 -06:00
|
|
|
{{end}}
|
|
|
|
{{if not .PullRequestCtx.SameRepo}}
|
|
|
|
{{range .HeadBranches}}
|
2021-11-16 11:18:25 -07:00
|
|
|
<div class="item" data-url="{{$.HeadRepo.Link}}/compare/{{PathEscapeSegments .}}{{$.CompareSeparator}}{{PathEscape $.HeadUser.Name}}/{{PathEscape $.HeadRepo.Name}}:{{PathEscapeSegments $.HeadBranch}}">{{$HeadCompareName}}:{{.}}</div>
|
2019-06-07 14:29:29 -06:00
|
|
|
{{end}}
|
2021-05-07 15:10:05 -06:00
|
|
|
{{end}}
|
|
|
|
{{if .OwnForkRepo}}
|
|
|
|
{{range .OwnForkRepoBranches}}
|
2021-11-16 11:18:25 -07:00
|
|
|
<div class="item" data-url="{{$.OwnForkRepo.Link}}/compare/{{PathEscapeSegments .}}{{$.CompareSeparator}}{{PathEscape $.HeadUser.Name}}/{{PathEscape $.HeadRepo.Name}}:{{PathEscapeSegments $.HeadBranch}}">{{$OwnForkCompareName}}:{{.}}</div>
|
2020-05-11 23:52:46 -06:00
|
|
|
{{end}}
|
2021-05-07 15:10:05 -06:00
|
|
|
{{end}}
|
2023-10-10 22:24:07 -06:00
|
|
|
{{if and .RootRepo (.RootRepo.AllowsPulls ctx)}}
|
2021-05-07 15:10:05 -06:00
|
|
|
{{range .RootRepoBranches}}
|
2021-11-16 11:18:25 -07:00
|
|
|
<div class="item" data-url="{{$.RootRepo.Link}}/compare/{{PathEscapeSegments .}}{{$.CompareSeparator}}{{PathEscape $.HeadUser.Name}}/{{PathEscape $.HeadRepo.Name}}:{{PathEscapeSegments $.HeadBranch}}">{{$RootRepoCompareName}}:{{.}}</div>
|
2020-05-11 23:52:46 -06:00
|
|
|
{{end}}
|
2021-05-07 15:10:05 -06:00
|
|
|
{{end}}
|
|
|
|
</div>
|
2024-03-24 12:23:38 -06:00
|
|
|
<div class="scrolling menu reference-list-menu base-tag-list tw-hidden">
|
2021-05-07 15:10:05 -06:00
|
|
|
{{range .Tags}}
|
2021-11-16 11:18:25 -07:00
|
|
|
<div class="item {{if eq $.BaseBranch .}}selected{{end}}" data-url="{{$.RepoLink}}/compare/{{PathEscapeSegments .}}{{$.CompareSeparator}}{{if not $.PullRequestCtx.SameRepo}}{{PathEscape $.HeadUser.Name}}/{{PathEscape $.HeadRepo.Name}}:{{end}}{{PathEscapeSegments $.HeadBranch}}">{{$BaseCompareName}}:{{.}}</div>
|
2021-05-07 15:10:05 -06:00
|
|
|
{{end}}
|
|
|
|
{{if not .PullRequestCtx.SameRepo}}
|
|
|
|
{{range .HeadTags}}
|
2021-11-16 11:18:25 -07:00
|
|
|
<div class="item" data-url="{{$.HeadRepo.Link}}/compare/{{PathEscapeSegments .}}{{$.CompareSeparator}}{{PathEscape $.HeadUser.Name}}/{{PathEscape $.HeadRepo.Name}}:{{PathEscapeSegments $.HeadBranch}}">{{$HeadCompareName}}:{{.}}</div>
|
2019-10-29 23:58:18 -06:00
|
|
|
{{end}}
|
2021-05-07 15:10:05 -06:00
|
|
|
{{end}}
|
|
|
|
{{if .OwnForkRepo}}
|
|
|
|
{{range .OwnForkRepoTags}}
|
2021-11-16 11:18:25 -07:00
|
|
|
<div class="item" data-url="{{$.OwnForkRepo.Link}}/compare/{{PathEscapeSegments .}}{{$.CompareSeparator}}{{PathEscape $.HeadUser.Name}}/{{PathEscape $.HeadRepo.Name}}:{{PathEscapeSegments $.HeadBranch}}">{{$OwnForkCompareName}}:{{.}}</div>
|
2021-05-07 15:10:05 -06:00
|
|
|
{{end}}
|
|
|
|
{{end}}
|
|
|
|
{{if .RootRepo}}
|
|
|
|
{{range .RootRepoTags}}
|
2021-11-16 11:18:25 -07:00
|
|
|
<div class="item" data-url="{{$.RootRepo.Link}}/compare/{{PathEscapeSegments .}}{{$.CompareSeparator}}{{PathEscape $.HeadUser.Name}}/{{PathEscape $.HeadRepo.Name}}:{{PathEscapeSegments $.HeadBranch}}">{{$RootRepoCompareName}}:{{.}}</div>
|
2021-05-07 15:10:05 -06:00
|
|
|
{{end}}
|
|
|
|
{{end}}
|
2019-06-07 14:29:29 -06:00
|
|
|
</div>
|
|
|
|
</div>
|
2021-05-07 15:10:05 -06:00
|
|
|
</div>
|
2024-01-05 10:38:56 -07:00
|
|
|
<a href="{{.RepoLink}}/compare/{{PathEscapeSegments .BaseBranch}}{{.OtherCompareSeparator}}{{if not $.PullRequestCtx.SameRepo}}{{PathEscape $.HeadUser.Name}}/{{PathEscape $.HeadRepo.Name}}:{{end}}{{PathEscapeSegments $.HeadBranch}}" title="{{ctx.Locale.Tr "repo.pulls.switch_comparison_type"}}">{{svg "octicon-arrow-left" 16}}<div class="compare-separator">{{.CompareSeparator}}</div></a>
|
2021-05-07 15:10:05 -06:00
|
|
|
<div class="ui floating filter dropdown">
|
|
|
|
<div class="ui basic small button">
|
2023-09-25 06:42:40 -06:00
|
|
|
<span class="text">{{if $.PageIsComparePull}}{{ctx.Locale.Tr "repo.pulls.compare_compare"}}{{else}}{{ctx.Locale.Tr "repo.compare.compare_head"}}{{end}}: {{$HeadCompareName}}:{{$.HeadBranch}}</span>
|
2021-05-07 15:10:05 -06:00
|
|
|
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
|
|
|
|
</div>
|
|
|
|
<div class="menu">
|
|
|
|
<div class="ui icon search input">
|
2023-06-14 10:40:15 -06:00
|
|
|
<i class="icon">{{svg "octicon-filter" 16}}</i>
|
2023-09-25 02:56:50 -06:00
|
|
|
<input name="search" placeholder="{{ctx.Locale.Tr "repo.filter_branch_and_tag"}}...">
|
2019-06-07 14:29:29 -06:00
|
|
|
</div>
|
2021-05-07 15:10:05 -06:00
|
|
|
<div class="header">
|
|
|
|
<div class="ui grid">
|
|
|
|
<div class="two column row">
|
|
|
|
<a class="reference column" href="#" data-target=".head-branch-list">
|
|
|
|
<span class="text black">
|
Migrate margin and padding helpers to tailwind (#30043)
This will conclude the refactor of 1:1 class replacements to tailwind,
except `gt-hidden`. Commands ran:
```bash
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-0#tw-$1$2-0#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-1#tw-$1$2-0.5#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-2#tw-$1$2-1#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-3#tw-$1$2-2#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-4#tw-$1$2-4#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-5#tw-$1$2-8#g' {web_src/js,templates,routers,services}/**/*
```
2024-03-24 10:42:49 -06:00
|
|
|
{{svg "octicon-git-branch" 16 "tw-mr-1"}}{{ctx.Locale.Tr "repo.branches"}}
|
2021-05-07 15:10:05 -06:00
|
|
|
</span>
|
|
|
|
</a>
|
|
|
|
<a class="reference column" href="#" data-target=".head-tag-list">
|
|
|
|
<span class="text black">
|
Migrate margin and padding helpers to tailwind (#30043)
This will conclude the refactor of 1:1 class replacements to tailwind,
except `gt-hidden`. Commands ran:
```bash
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-0#tw-$1$2-0#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-1#tw-$1$2-0.5#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-2#tw-$1$2-1#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-3#tw-$1$2-2#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-4#tw-$1$2-4#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-5#tw-$1$2-8#g' {web_src/js,templates,routers,services}/**/*
```
2024-03-24 10:42:49 -06:00
|
|
|
{{svg "octicon-tag" 16 "tw-mr-1"}}{{ctx.Locale.Tr "repo.tags"}}
|
2021-05-07 15:10:05 -06:00
|
|
|
</span>
|
|
|
|
</a>
|
|
|
|
</div>
|
2019-06-07 14:29:29 -06:00
|
|
|
</div>
|
2021-05-07 15:10:05 -06:00
|
|
|
</div>
|
|
|
|
<div class="scrolling menu reference-list-menu head-branch-list">
|
|
|
|
{{range .HeadBranches}}
|
2021-11-16 11:18:25 -07:00
|
|
|
<div class="{{if eq $.HeadBranch .}}selected{{end}} item" data-url="{{$.RepoLink}}/compare/{{PathEscapeSegments $.BaseBranch}}{{$.CompareSeparator}}{{if not $.PullRequestCtx.SameRepo}}{{PathEscape $.HeadUser.Name}}/{{PathEscape $.HeadRepo.Name}}:{{end}}{{PathEscapeSegments .}}">{{$HeadCompareName}}:{{.}}</div>
|
2021-05-07 15:10:05 -06:00
|
|
|
{{end}}
|
|
|
|
{{if not .PullRequestCtx.SameRepo}}
|
|
|
|
{{range .Branches}}
|
2021-11-16 11:18:25 -07:00
|
|
|
<div class="item" data-url="{{$.RepoLink}}/compare/{{PathEscapeSegments $.BaseBranch}}{{$.CompareSeparator}}{{PathEscape $.BaseName}}/{{PathEscape $.Repository.Name}}:{{PathEscapeSegments .}}">{{$BaseCompareName}}:{{.}}</div>
|
2020-05-11 23:52:46 -06:00
|
|
|
{{end}}
|
2021-05-07 15:10:05 -06:00
|
|
|
{{end}}
|
|
|
|
{{if .OwnForkRepo}}
|
|
|
|
{{range .OwnForkRepoBranches}}
|
2021-11-16 11:18:25 -07:00
|
|
|
<div class="item" data-url="{{$.RepoLink}}/compare/{{PathEscapeSegments $.BaseBranch}}{{$.CompareSeparator}}{{PathEscape $.OwnForkRepo.OwnerName}}/{{PathEscape $.OwnForkRepo.Name}}:{{PathEscapeSegments .}}">{{$OwnForkCompareName}}:{{.}}</div>
|
2020-05-11 23:52:46 -06:00
|
|
|
{{end}}
|
2021-05-07 15:10:05 -06:00
|
|
|
{{end}}
|
|
|
|
{{if .RootRepo}}
|
|
|
|
{{range .RootRepoBranches}}
|
2021-11-16 11:18:25 -07:00
|
|
|
<div class="item" data-url="{{$.RepoLink}}/compare/{{PathEscapeSegments $.BaseBranch}}{{$.CompareSeparator}}{{PathEscape $.RootRepo.OwnerName}}/{{PathEscape $.RootRepo.Name}}:{{PathEscapeSegments .}}">{{$RootRepoCompareName}}:{{.}}</div>
|
2020-05-11 23:52:46 -06:00
|
|
|
{{end}}
|
2021-05-07 15:10:05 -06:00
|
|
|
{{end}}
|
|
|
|
</div>
|
2024-03-24 12:23:38 -06:00
|
|
|
<div class="scrolling menu reference-list-menu head-tag-list tw-hidden">
|
2021-05-07 15:10:05 -06:00
|
|
|
{{range .HeadTags}}
|
2021-11-16 11:18:25 -07:00
|
|
|
<div class="{{if eq $.HeadBranch .}}selected{{end}} item" data-url="{{$.RepoLink}}/compare/{{PathEscapeSegments $.BaseBranch}}{{$.CompareSeparator}}{{if not $.PullRequestCtx.SameRepo}}{{PathEscape $.HeadUser.Name}}/{{PathEscape $.HeadRepo.Name}}:{{end}}{{PathEscapeSegments .}}">{{$HeadCompareName}}:{{.}}</div>
|
2021-05-07 15:10:05 -06:00
|
|
|
{{end}}
|
|
|
|
{{if not .PullRequestCtx.SameRepo}}
|
|
|
|
{{range .Tags}}
|
2021-11-16 11:18:25 -07:00
|
|
|
<div class="item" data-url="{{$.RepoLink}}/compare/{{PathEscapeSegments $.BaseBranch}}{{$.CompareSeparator}}{{PathEscape $.BaseName}}/{{PathEscape $.Repository.Name}}:{{PathEscapeSegments .}}">{{$BaseCompareName}}:{{.}}</div>
|
2019-06-07 14:29:29 -06:00
|
|
|
{{end}}
|
2021-05-07 15:10:05 -06:00
|
|
|
{{end}}
|
|
|
|
{{if .OwnForkRepo}}
|
|
|
|
{{range .OwnForkRepoTags}}
|
2021-11-16 11:18:25 -07:00
|
|
|
<div class="item" data-url="{{$.RepoLink}}/compare/{{PathEscapeSegments $.BaseBranch}}{{$.CompareSeparator}}{{PathEscape $.OwnForkRepo.OwnerName}}/{{PathEscape $.OwnForkRepo.Name}}:{{PathEscapeSegments .}}">{{$OwnForkCompareName}}:{{.}}</div>
|
2021-05-07 15:10:05 -06:00
|
|
|
{{end}}
|
|
|
|
{{end}}
|
|
|
|
{{if .RootRepo}}
|
|
|
|
{{range .RootRepoTags}}
|
2021-11-16 11:18:25 -07:00
|
|
|
<div class="item" data-url="{{$.RepoLink}}/compare/{{PathEscapeSegments $.BaseBranch}}{{$.CompareSeparator}}{{PathEscape $.RootRepo.OwnerName}}/{{PathEscape $.RootRepo.Name}}:{{PathEscapeSegments .}}">{{$RootRepoCompareName}}:{{.}}</div>
|
2021-05-07 15:10:05 -06:00
|
|
|
{{end}}
|
|
|
|
{{end}}
|
2019-06-07 14:29:29 -06:00
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
2021-05-07 15:10:05 -06:00
|
|
|
</div>
|
2019-06-07 14:29:29 -06:00
|
|
|
|
|
|
|
{{if .IsNothingToCompare}}
|
2024-01-21 08:13:00 -07:00
|
|
|
{{if and $.IsSigned $.AllowEmptyPr (not .Repository.IsArchived) .PageIsComparePull}}
|
2023-09-25 02:56:50 -06:00
|
|
|
<div class="ui segment">{{ctx.Locale.Tr "repo.pulls.nothing_to_compare_and_allow_empty_pr"}}</div>
|
2024-03-24 12:23:38 -06:00
|
|
|
<div class="ui info message show-form-container {{if .Flash}}tw-hidden{{end}}">
|
2023-09-25 02:56:50 -06:00
|
|
|
<button class="ui button primary show-form">{{ctx.Locale.Tr "repo.pulls.new"}}</button>
|
2021-03-03 20:41:23 -07:00
|
|
|
</div>
|
2024-03-24 12:23:38 -06:00
|
|
|
<div class="pullrequest-form {{if not .Flash}}tw-hidden{{end}}">
|
2021-03-03 20:41:23 -07:00
|
|
|
{{template "repo/issue/new_form" .}}
|
|
|
|
</div>
|
2024-01-21 08:13:00 -07:00
|
|
|
{{else if and .HeadIsBranch .BaseIsBranch}}
|
2023-09-25 02:56:50 -06:00
|
|
|
<div class="ui segment">{{ctx.Locale.Tr "repo.pulls.nothing_to_compare"}}</div>
|
2024-01-21 08:13:00 -07:00
|
|
|
{{else}}
|
|
|
|
<div class="ui segment">{{ctx.Locale.Tr "repo.pulls.nothing_to_compare_have_tag"}}</div>
|
2021-03-03 20:41:23 -07:00
|
|
|
{{end}}
|
2020-05-02 02:06:01 -06:00
|
|
|
{{else if and .PageIsComparePull (gt .CommitCount 0)}}
|
2019-06-07 14:29:29 -06:00
|
|
|
{{if .HasPullRequest}}
|
2021-12-24 05:14:42 -07:00
|
|
|
<div class="ui segment grid title">
|
|
|
|
<div class="twelve wide column issue-title">
|
2024-02-25 07:02:20 -07:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.has_pull_request" (print $.RepoLink "/pulls/" .PullRequest.Issue.Index) $.RepoRelPath .PullRequest.Index}}
|
2021-12-24 05:14:42 -07:00
|
|
|
<h1>
|
2024-01-15 01:49:24 -07:00
|
|
|
<span id="issue-title">{{RenderIssueTitle $.Context .PullRequest.Issue.Title ($.Repository.ComposeMetas ctx)}}</span>
|
2021-12-24 05:14:42 -07:00
|
|
|
<span class="index">#{{.PullRequest.Issue.Index}}</span>
|
|
|
|
</h1>
|
|
|
|
</div>
|
2023-05-08 23:21:03 -06:00
|
|
|
<div class="four wide column middle aligned text right">
|
2021-12-24 05:14:42 -07:00
|
|
|
{{- if .PullRequest.HasMerged -}}
|
2024-02-25 07:02:20 -07:00
|
|
|
<a href="{{$.RepoLink}}/pulls/{{.PullRequest.Issue.Index}}" class="ui button purple show-form">{{svg "octicon-git-merge" 16}} {{ctx.Locale.Tr "repo.pulls.view"}}</a>
|
2021-12-24 05:14:42 -07:00
|
|
|
{{else if .Issue.IsClosed}}
|
2024-02-25 07:02:20 -07:00
|
|
|
<a href="{{$.RepoLink}}/pulls/{{.PullRequest.Issue.Index}}" class="ui button red show-form">{{svg "octicon-issue-closed" 16}} {{ctx.Locale.Tr "repo.pulls.view"}}</a>
|
2021-12-24 05:14:42 -07:00
|
|
|
{{else}}
|
2024-02-25 07:02:20 -07:00
|
|
|
<a href="{{$.RepoLink}}/pulls/{{.PullRequest.Issue.Index}}" class="ui button primary show-form">{{svg "octicon-git-pull-request" 16}} {{ctx.Locale.Tr "repo.pulls.view"}}</a>
|
2023-05-08 23:21:03 -06:00
|
|
|
{{end}}
|
|
|
|
</div>
|
2021-04-10 21:46:37 -06:00
|
|
|
</div>
|
2020-05-04 16:44:30 -06:00
|
|
|
{{else}}
|
|
|
|
{{if and $.IsSigned (not .Repository.IsArchived)}}
|
2024-03-24 12:23:38 -06:00
|
|
|
<div class="ui info message show-form-container {{if .Flash}}tw-hidden{{end}}">
|
2023-09-25 02:56:50 -06:00
|
|
|
<button class="ui button primary show-form">{{ctx.Locale.Tr "repo.pulls.new"}}</button>
|
2020-05-04 16:44:30 -06:00
|
|
|
</div>
|
|
|
|
{{else if .Repository.IsArchived}}
|
2024-03-03 20:33:20 -07:00
|
|
|
<div class="ui warning message tw-text-center">
|
2023-04-26 08:46:26 -06:00
|
|
|
{{if .Repository.ArchivedUnix.IsZero}}
|
2023-09-25 02:56:50 -06:00
|
|
|
{{ctx.Locale.Tr "repo.archive.title"}}
|
2023-04-26 08:46:26 -06:00
|
|
|
{{else}}
|
2024-02-22 10:02:33 -07:00
|
|
|
{{ctx.Locale.Tr "repo.archive.title_date" (DateTime "long" .Repository.ArchivedUnix)}}
|
2023-04-26 08:46:26 -06:00
|
|
|
{{end}}
|
2020-05-04 16:44:30 -06:00
|
|
|
</div>
|
|
|
|
{{end}}
|
|
|
|
{{if $.IsSigned}}
|
2024-03-24 12:23:38 -06:00
|
|
|
<div class="pullrequest-form {{if not .Flash}}tw-hidden{{end}}">
|
2020-05-04 16:44:30 -06:00
|
|
|
{{template "repo/issue/new_form" .}}
|
|
|
|
</div>
|
|
|
|
{{end}}
|
2023-05-08 23:21:03 -06:00
|
|
|
{{$showDiffBox = true}}
|
2020-05-04 16:44:30 -06:00
|
|
|
{{end}}
|
2024-01-21 08:13:00 -07:00
|
|
|
{{else if not .IsNothingToCompare}}
|
2023-05-08 23:21:03 -06:00
|
|
|
{{$showDiffBox = true}}
|
|
|
|
{{end}}
|
|
|
|
</div>
|
|
|
|
|
|
|
|
{{if $showDiffBox}}
|
2023-11-23 08:52:57 -07:00
|
|
|
<div class="ui container fluid padded">
|
2019-06-07 14:29:29 -06:00
|
|
|
{{template "repo/commits_table" .}}
|
|
|
|
{{template "repo/diff/box" .}}
|
|
|
|
</div>
|
2023-05-08 23:21:03 -06:00
|
|
|
{{end}}
|
2019-06-07 14:29:29 -06:00
|
|
|
</div>
|
|
|
|
{{template "base/footer" .}}
|