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 duplicate migrated milestones #30102

Merged
merged 2 commits into from
Mar 26, 2024
Merged

Fix duplicate migrated milestones #30102

merged 2 commits into from
Mar 26, 2024

Conversation

yp05327
Copy link
Contributor

@yp05327 yp05327 commented Mar 26, 2024

Fix #17567

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 26, 2024
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 26, 2024
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Mar 26, 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 Mar 26, 2024
@lunny lunny added the backport/v1.21 This PR should be backported to Gitea 1.21 label Mar 26, 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 Mar 26, 2024
@wolfogre wolfogre added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 26, 2024
@lunny lunny enabled auto-merge (squash) March 26, 2024 09:57
@lunny lunny merged commit 274bc00 into go-gitea:main Mar 26, 2024
25 of 26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone Mar 26, 2024
@GiteaBot
Copy link
Collaborator

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

go run ./contrib/backport 30102
...  // 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 Mar 26, 2024
@yp05327 yp05327 mentioned this pull request Mar 26, 2024
Merged
lunny pushed a commit that referenced this pull request Mar 26, 2024
@yp05327
Fix duplicate migrated milestones (#30102) (#30105)
a0f89ba 
backport #30102
silverwind added a commit to silverwind/gitea that referenced this pull request Mar 26, 2024
@silverwind
Merge remote-tracking branch 'origin/main' into coloris
c36d353 
* origin/main:
  Remove jQuery `.attr` from the Fomantic modal cancel buttons (go-gitea#30113)
  Remove jQuery `.attr` from the code comments (go-gitea#30112)
  Remove jQuery calls that have no effect on `showElem` and `hideElem` (go-gitea#30110)
  Remove jQuery `.attr` from the common issue page functions (go-gitea#30083)
  Restore aligned grid column CSS (go-gitea#30106)
  Fix possible data race on tests (go-gitea#30093)
  Add svg linter and fix incorrect svgs (go-gitea#30086)
  Fix duplicate migrated milestones (go-gitea#30102)
  Update JS any PY dependencies, remove workarounds (go-gitea#30085)
  Fix gitea doctor will remove repo-avatar files when execute command `storage-archives` (go-gitea#30094)
  Fix alignment in actions right view (go-gitea#29979)
  Remove repetitive words (go-gitea#30091)
  Fix table header text-align (go-gitea#30084)
  Fix panic for `fixBrokenRepoUnits16961` (go-gitea#30068)
@yp05327 yp05327 deleted the fix-17567 branch March 26, 2024 23:52
@techknowlogick techknowlogick modified the milestones: 1.23.0, 1.22.0 Mar 28, 2024
@lunny lunny added the backport/done All backports for this PR have been created label Apr 12, 2024
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jun 24, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@wolfogre wolfogre wolfogre approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
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/go Pull requests that update Go code size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.

Migrated milestone may be duplicated.
5 participants
@yp05327 @GiteaBot @lunny @wolfogre @techknowlogick