Skip to content

Conversation

@lunny
Copy link
Member

@lunny lunny commented Feb 8, 2024

Fix #29073

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 8, 2024
@github-actions github-actions bot added the modifies/cli PR changes something on the CLI, i.e. gitea doctor or gitea admin label Feb 8, 2024
@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 Feb 8, 2024
@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 Feb 8, 2024
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Feb 8, 2024
@lunny lunny enabled auto-merge (squash) February 8, 2024 12:43
@lunny lunny merged commit 96ad1d6 into go-gitea:main Feb 8, 2024
@GiteaBot GiteaBot added this to the 1.22.0 milestone Feb 8, 2024
@GiteaBot
Copy link
Collaborator

GiteaBot commented Feb 8, 2024

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

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

@GiteaBot GiteaBot added backport/manual No power to the bots! Create your backport yourself! and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Feb 8, 2024
@lunny lunny deleted the lunny/fix_push_create branch February 17, 2024 05:14
lunny added a commit to lunny/gitea that referenced this pull request Feb 17, 2024
@lunny lunny added the backport/done All backports for this PR have been created label Feb 17, 2024
KN4CK3R added a commit that referenced this pull request Feb 17, 2024
Fix #29073
Backport #29090

Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
silverwind pushed a commit to silverwind/gitea that referenced this pull request Feb 20, 2024
6543 pushed a commit to 6543-forks/gitea that referenced this pull request Feb 26, 2024
@github-actions
Copy link

Automatically locked because of our CONTRIBUTING guidelines

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 28, 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! lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/cli PR changes something on the CLI, i.e. gitea doctor or gitea admin type/bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Capitalization discarded on push-to-create

4 participants