Conversation

Zettat123

Fix #34504

Since one required context can match more than one commit statuses, we should not directly compare the lengths of requiredCommitStatuses and requiredContexts

@GiteaBotGiteaBot added the lgtm/need 2This PR needs two approvals by maintainers to be considered for merging.label Jun 22, 2025
@github-actions-actions bot added the modifies/goPull requests that update Go codelabel Jun 22, 2025
@GiteaBotGiteaBot added lgtm/need 1This PR needs approval from one additional maintainer to be merged.and removed lgtm/need 2This PR needs two approvals by maintainers to be considered for merging.labels Jun 22, 2025
@lunnylunny added type/bug backport/v1.24This PR should be backported to Gitea 1.24labels Jun 22, 2025
wxiaoguang
wxiaoguang reviewed Jun 22, 2025
View reviewed changes
@GiteaBotGiteaBot added lgtm/doneThis PR has enough approvals to get merged. There are no important open reservations anymore.and removed lgtm/need 1This PR needs approval from one additional maintainer to be merged.labels Jun 22, 2025
@lunnylunny added the reviewed/wait-mergeThis pull request is part of the merge queue. It will be merged soon.label Jun 22, 2025
@lunnylunny enabled auto-merge (squash) June 22, 2025 23:19
@lunnylunny merged commit 618e2d8 into go-gitea:main Jun 22, 2025
26 checks passed
@GiteaBotGiteaBot added this to the 1.25.0 milestone Jun 22, 2025
@GiteaBot

I was unable to create a backport for 1.24. @Zettat123, please send one manually. 🍵

go run ./contrib/backport 34815
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBotGiteaBot added backport/manualNo power to the bots! Create your backport yourself!and removed reviewed/wait-mergeThis pull request is part of the merge queue. It will be merged soon.labels Jun 22, 2025
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jun 23, 2025
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
e441bc6
* giteaofficial/main: (22 commits)
  [skip ci] Updated translations via Crowdin
  Fix required contexts and commit status matching bug (go-gitea#34815)
  Add "Cancel workflow run" button to Actions list page (go-gitea#34817)
  Use `shallowRef` instead of `ref` in `.vue` files where possible (go-gitea#34813)
  Edit file workflow for creating a fork and proposing changes (go-gitea#34240)
  Refactor packages (go-gitea#34777)
  Refactor wiki (go-gitea#34805)
  [skip ci] Updated translations via Crowdin
  Upgrade htmx to 2.0.5 (go-gitea#34809)
  Forks repository list page follow other repositories page (go-gitea#34784)
  Add post-installation redirect based on admin account status (go-gitea#34493)
  Rework delete org and rename org UI (go-gitea#34762)
  Refactor editor (go-gitea#34780)
  Improve img lazy loading (go-gitea#34804)
  [skip ci] Updated translations via Crowdin
  Fix Feishu webhook signature verification (go-gitea#34788)
  Upgrade chi to v5.2.2 (go-gitea#34798)
  Fix the issue of abnormal interface when there is no issue-item on the project page (go-gitea#34791)
  Fix container range bug (go-gitea#34795)
  Fix OCI manifest parser (go-gitea#34797)
  ...
@Zettat123Zettat123 mentioned this pull request Jun 23, 2025
Merged
@Zettat123

I was unable to create a backport for 1.24. @Zettat123, please send one manually. 🍵

go run ./contrib/backport 34815
...  // fix git conflicts if any
go run ./contrib/backport --continue

--> #34829

@lunnylunny added the backport/doneAll backports for this PR have been createdlabel Jun 23, 2025
wxiaoguang pushed a commit that referenced this pull request Jun 23, 2025
@Zettat123
Fix required contexts and commit status matching bug (#34815) (#34829)
a57e2c4
Backport #34815

Fix #34504

Since one required context can match more than one commit statuses, we
should not directly compare the lengths of `requiredCommitStatuses` and
`requiredContexts`
Sign up for free to join this conversation on . Already have an account? Sign in to comment

@lunny lunny lunny approved these changes

@wxiaoguang wxiaoguang wxiaoguang approved these changes

No one assigned
backport/doneAll backports for this PR have been createdbackport/manualNo power to the bots! Create your backport yourself!backport/v1.24This PR should be backported to Gitea 1.24lgtm/doneThis PR has enough approvals to get merged. There are no important open reservations anymore.modifies/goPull requests that update Go codetype/bug
None yet
1.25.0

Successfully merging this pull request may close these issues.

Branch protection with required status check