Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix branch protection priority #24045

Merged
merged 7 commits into from
Apr 11, 2023
Merged

Fix branch protection priority #24045

merged 7 commits into from
Apr 11, 2023

Conversation

lunny
Copy link
Member

@lunny lunny commented Apr 11, 2023

Fix #24044

@lunny lunny added type/bug skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. outdated/backport/v1.19 This PR should be backported to Gitea 1.19 labels Apr 11, 2023
@lunny lunny added this to the 1.20.0 milestone Apr 11, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 11, 2023
@codecov-commenter
Copy link

codecov-commenter commented Apr 11, 2023 •
edited
Loading

Codecov Report

Merging #24045 (400ccb5) into main (f521e88) will decrease coverage by 0.12%.
The diff coverage is 32.89%.

@@            Coverage Diff             @@
##             main   #24045      +/-   ##
==========================================
- Coverage   47.14%   47.02%   -0.12%     
==========================================
  Files        1149     1163      +14     
  Lines      151446   153652    +2206     
==========================================
+ Hits        71397    72253     +856     
- Misses      71611    72892    +1281     
- Partials     8438     8507      +69
Impacted Files Coverage Δ
cmd/dump.go 0.64% <0.00%> (-0.03%) ⬇️
cmd/mailer.go 0.00% <0.00%> (ø)
cmd/manager.go 0.00% <0.00%> (ø)
cmd/manager_logging.go 0.00% <0.00%> (ø)
cmd/migrate_storage.go 5.76% <0.00%> (-0.12%) ⬇️
cmd/restore_repo.go 0.00% <0.00%> (ø)
cmd/web.go 0.00% <0.00%> (ø)
models/actions/run.go 1.63% <0.00%> (-0.10%) ⬇️
models/actions/runner.go 1.44% <ø> (ø)
models/organization/org_user.go 80.51% <0.00%> (-12.02%) ⬇️
... and 62 more

... and 123 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Apr 11, 2023
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Apr 11, 2023
@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 11, 2023
delvh
delvh approved these changes Apr 11, 2023
View reviewed changes
Copy link
Member

@delvh delvh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How can it both be skip-changelog and backport?
That's a paradoxon.
I think this PR shouldn't be skip-changelog.

@delvh delvh removed the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Apr 11, 2023
@6543 6543 enabled auto-merge (squash) April 11, 2023 17:06
@6543 6543 merged commit 0536712 into go-gitea:main Apr 11, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 11, 2023
@GiteaBot GiteaBot mentioned this pull request Apr 11, 2023
Merged
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Apr 11, 2023
@lunny @GiteaBot
Fix branch protection priority (go-gitea#24045)
11f3320 
Fix go-gitea#24044
6543 pushed a commit that referenced this pull request Apr 11, 2023
@GiteaBot @lunny
Fix branch protection priority (#24045) (#24061)
580da8f 
Backport #24045 by @lunny

Fix #24044

Co-authored-by: Lunny Xiao <[email protected]>
@GiteaBot
Copy link
Contributor

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

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Apr 11, 2023
@6543 6543 added backport/done All backports for this PR have been created and removed backport/manual No power to the bots! Create your backport yourself! labels Apr 11, 2023
@lunny lunny deleted the lunny/fix_project_branch_pri branch April 12, 2023 01:26
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 12, 2023
@zjjhot
Merge remote-tracking branch 'upstream/main'
f448ed4 
* upstream/main:
  Add popup to hashed comments/pull requests/issues in file editing/adding preview tab (go-gitea#24040)
  Use reactive store to share data between components (go-gitea#23996)
  [skip ci] Updated translations via Crowdin
  Fix accidental overwriting of LDAP team memberships (go-gitea#24050)
  Add cardtype to org/user level project on creation, edit and view (go-gitea#24043)
  Fix branch protection priority (go-gitea#24045)
  Update documentation to explain which projects allow Gitea to host static pages (go-gitea#23993)
  Fix date  display bug (go-gitea#24047)
  Fine tune markdown editor toolbar (go-gitea#24046)
  Add tooltips for MD editor buttons and add `muted` class for buttons (go-gitea#23896)
  Prefer native parser for SSH public key parsing (go-gitea#23798)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 31, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@wxiaoguang wxiaoguang wxiaoguang left review comments

@yardenshoham yardenshoham yardenshoham left review comments

@silverwind silverwind silverwind approved these changes

@wolfogre wolfogre wolfogre approved these changes

@delvh delvh delvh approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. outdated/backport/v1.19 This PR should be backported to Gitea 1.19 type/bug
Projects
None yet
Milestone
1.20.0
Development

Successfully merging this pull request may close these issues.

Specific branch protection doesn't (always) override wildcard protection
9 participants
@lunny @codecov-commenter @GiteaBot @silverwind @wxiaoguang @wolfogre @yardenshoham @delvh @6543