Merge branch 'main' into fix-submodule-nil

wxiaoguang · web-flow · commit 73b8cf856b13 · 2025-07-18T16:49:07.000+08:00
diff --git a/models/actions/run_job.go b/models/actions/run_job.go
@@ -187,10 +187,10 @@ func AggregateJobStatus(jobs []*ActionRunJob) Status {
 		return StatusCancelled
 	case hasRunning:
 		return StatusRunning
-	case hasFailure:
-		return StatusFailure
 	case hasWaiting:
 		return StatusWaiting
+	case hasFailure:
+		return StatusFailure
 	case hasBlocked:
 		return StatusBlocked
 	default:
diff --git a/models/actions/run_job_status_test.go b/models/actions/run_job_status_test.go
@@ -64,7 +64,7 @@ func TestAggregateJobStatus(t *testing.T) {
 		{[]Status{StatusFailure, StatusSuccess}, StatusFailure},
 		{[]Status{StatusFailure, StatusSkipped}, StatusFailure},
 		{[]Status{StatusFailure, StatusCancelled}, StatusCancelled},
-		{[]Status{StatusFailure, StatusWaiting}, StatusFailure},
+		{[]Status{StatusFailure, StatusWaiting}, StatusWaiting},
 		{[]Status{StatusFailure, StatusRunning}, StatusRunning},
 		{[]Status{StatusFailure, StatusBlocked}, StatusFailure},
 
diff --git a/models/issues/pull.go b/models/issues/pull.go
@@ -413,7 +413,7 @@ func (pr *PullRequest) getReviewedByLines(ctx context.Context, writer io.Writer)
 	return committer.Commit()
 }
 
-// GetGitRefName returns git ref for hidden pull request branch
+// GetGitHeadRefName returns git ref for hidden pull request branch
 func (pr *PullRequest) GetGitHeadRefName() string {
 	return fmt.Sprintf("%s%d/head", git.PullPrefix, pr.Index)
 }
diff --git a/modules/migration/pullrequest.go b/modules/migration/pullrequest.go
@@ -49,7 +49,7 @@ func (p *PullRequest) IsForkPullRequest() bool {
 	return p.Head.RepoFullName() != p.Base.RepoFullName()
 }
 
-// GetGitRefName returns pull request relative path to head
+// GetGitHeadRefName returns pull request relative path to head
 func (p PullRequest) GetGitHeadRefName() string {
 	return fmt.Sprintf("%s%d/head", git.PullPrefix, p.Number)
 }
diff --git a/options/locale/locale_ga-IE.ini b/options/locale/locale_ga-IE.ini
diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini
diff --git a/templates/repo/issue/view_content/pull_merge_instruction.tmpl b/templates/repo/issue/view_content/pull_merge_instruction.tmpl
@@ -11,7 +11,7 @@
 			{{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 {{.PullRequest.GetGitRefName}}:{{$localBranch}}</div>
+			<div>git fetch -u origin {{.PullRequest.GetGitHeadRefName}}:{{$localBranch}}</div>
 			{{end}}
 			<div>git checkout {{$localBranch}}</div>
 		</div>
diff --git a/web_src/css/repo.css b/web_src/css/repo.css
@@ -141,7 +141,7 @@ td .commit-summary {
   align-items: center;
   overflow: hidden;
   text-overflow: ellipsis;
-  gap: 0.25em;
+  gap: 0.5em;
 }
 
 @media (max-width: 767.98px) {

Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ func (pr *PullRequest) getReviewedByLines(ctx context.Context, writer io.Writer)`
`413`	`413`	`return committer.Commit()`
`414`	`414`	`}`
`415`	`415`
`416`		`-// GetGitRefName returns git ref for hidden pull request branch`
	`416`	`+// GetGitHeadRefName returns git ref for hidden pull request branch`
`417`	`417`	`func (pr *PullRequest) GetGitHeadRefName() string {`
`418`	`418`	`return fmt.Sprintf("%s%d/head", git.PullPrefix, pr.Index)`
`419`	`419`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ func (p *PullRequest) IsForkPullRequest() bool {`
`49`	`49`	`return p.Head.RepoFullName() != p.Base.RepoFullName()`
`50`	`50`	`}`
`51`	`51`
`52`		`-// GetGitRefName returns pull request relative path to head`
	`52`	`+// GetGitHeadRefName returns pull request relative path to head`
`53`	`53`	`func (p PullRequest) GetGitHeadRefName() string {`
`54`	`54`	`return fmt.Sprintf("%s%d/head", git.PullPrefix, p.Number)`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ td .commit-summary {`
`141`	`141`	`align-items: center;`
`142`	`142`	`overflow: hidden;`
`143`	`143`	`text-overflow: ellipsis;`
`144`		`- gap: 0.25em;`
	`144`	`+ gap: 0.5em;`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`@media (max-width: 767.98px) {`