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.

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

Don't let API add 2 exclusive labels from same scope #27433

Merged
merged 3 commits into from Oct 5, 2023

Conversation

JakobDev
Copy link
Contributor

@JakobDev JakobDev commented Oct 4, 2023

Fixes #27380

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 4, 2023
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Oct 4, 2023
@github-actions github-actions bot added the modifies/api This PR adds API routes or modifies them label Oct 4, 2023
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.

LGTM once the debug comments have been removed

@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 Oct 4, 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 Oct 4, 2023
@techknowlogick techknowlogick added type/bug reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Oct 5, 2023
@techknowlogick techknowlogick enabled auto-merge (squash) October 5, 2023 03:07
@techknowlogick techknowlogick merged commit f2b2608 into go-gitea:main Oct 5, 2023
25 checks passed
@GiteaBot GiteaBot added this to the 1.22.0 milestone Oct 5, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 5, 2023
@JakobDev JakobDev deleted the scopefix branch October 5, 2023 05:58
@JakobDev
Copy link
Contributor Author

JakobDev commented Oct 5, 2023

This should probably be backported to 1.21

@delvh delvh added backport/v1.20 This PR should be backported to Gitea 1.20 backport/v1.21 This PR should be backported to Gitea 1.21 labels Oct 5, 2023
@GiteaBot
Copy link
Contributor

GiteaBot commented Oct 5, 2023

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

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

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Oct 5, 2023
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Oct 5, 2023
silverwind pushed a commit that referenced this pull request Oct 5, 2023
Backport #27433 by @JakobDev

Fixes #27380

Co-authored-by: JakobDev <jakobdev@gmx.de>
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jan 3, 2024
@lunny lunny added the backport/done All backports for this PR have been created label Feb 22, 2024
@lunny lunny removed the backport/v1.20 This PR should be backported to Gitea 1.20 label Feb 22, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! backport/v1.21 This PR should be backported to Gitea 1.21 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/api This PR adds API routes or modifies them size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Automated users can apply multiple labels of same type despite exclusive setting
7 participants