Skip to content

Commit 812c792

Browse files
authored
Merge branch 'main' into fix/review-request-number
2 parents 74724b7 + db09b35 commit 812c792

File tree

5 files changed

+5
-531
lines changed

5 files changed

+5
-531
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ or if SQLite support is required:
7979

8080
The `build` target is split into two sub-targets:
8181

82-
- `make backend` which requires [Go Stable](https://go.dev/dl/), required version is defined in [go.mod](/go.mod).
83-
- `make frontend` which requires [Node.js LTS](https://nodejs.org/en/download/) or greater and Internet connectivity to download npm dependencies.
82+
- `make backend` which requires [Go Stable](https://go.dev/dl/), the required version is defined in [go.mod](/go.mod).
83+
- `make frontend` which requires [Node.js LTS](https://nodejs.org/en/download/) or greater.
8484

85-
When building from the official source tarballs which include pre-built frontend files, the `frontend` target will not be triggered, making it possible to build without Node.js and Internet connectivity.
85+
Internet connectivity is required to download the go and npm modules. When building from the official source tarballs which include pre-built frontend files, the `frontend` target will not be triggered, making it possible to build without Node.js.
8686

8787
Parallelism (`make -j <num>`) is not supported.
8888

routers/web/repo/compare.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ func ParseCompareInfo(ctx *context.Context) *CompareInfo {
460460
rootRepo.ID != ci.HeadRepo.ID &&
461461
rootRepo.ID != baseRepo.ID {
462462
canRead := access_model.CheckRepoUnitUser(ctx, rootRepo, ctx.Doer, unit.TypeCode)
463-
if canRead && rootRepo.AllowsPulls() {
463+
if canRead {
464464
ctx.Data["RootRepo"] = rootRepo
465465
if !fileOnly {
466466
branches, tags, err := getBranchesAndTagsForRepo(ctx, rootRepo)

templates/repo/diff/compare.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<div class="item" data-url="{{$.OwnForkRepo.Link}}/compare/{{PathEscapeSegments .}}{{$.CompareSeparator}}{{PathEscape $.HeadUser.Name}}/{{PathEscape $.HeadRepo.Name}}:{{PathEscapeSegments $.HeadBranch}}">{{$OwnForkCompareName}}:{{.}}</div>
7878
{{end}}
7979
{{end}}
80-
{{if .RootRepo}}
80+
{{if and .RootRepo .RootRepo.AllowsPulls}}
8181
{{range .RootRepoBranches}}
8282
<div class="item" data-url="{{$.RootRepo.Link}}/compare/{{PathEscapeSegments .}}{{$.CompareSeparator}}{{PathEscape $.HeadUser.Name}}/{{PathEscape $.HeadRepo.Name}}:{{PathEscapeSegments $.HeadBranch}}">{{$RootRepoCompareName}}:{{.}}</div>
8383
{{end}}

0 commit comments

Comments
 (0)