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 order #31174

Merged
merged 3 commits into from
May 31, 2024
Merged

Fix branch order #31174

merged 3 commits into from
May 31, 2024

Conversation

lunny
Copy link
Member

@lunny lunny commented May 30, 2024

Fix #31172

The original order or the default order should not be ignored even if we have an is_deleted order.

@lunny lunny added type/bug backport/v1.22 This PR should be backported to Gitea 1.22 labels May 30, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 30, 2024
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label May 30, 2024
@lunny lunny requested a review from 6543 May 30, 2024 06:52
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label May 30, 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 May 30, 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 May 31, 2024
@yp05327 yp05327 added this to the 1.23.0 milestone May 31, 2024
@lunny lunny merged commit 1137a03 into go-gitea:main May 31, 2024
26 checks passed
@lunny lunny deleted the lunny/fix_branch_order branch May 31, 2024 01:58
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request May 31, 2024
@lunny @GiteaBot
Fix branch order (go-gitea#31174)
1d9854b 
Fix go-gitea#31172

The original order or the default order should not be ignored even if we
have an is_deleted order.
@GiteaBot GiteaBot mentioned this pull request May 31, 2024
Merged
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label May 31, 2024
lunny added a commit that referenced this pull request May 31, 2024
@GiteaBot @lunny
Fix branch order (#31174) (#31193)
c6176ee 
Backport #31174 by @lunny

Fix #31172

The original order or the default order should not be ignored even if we
have an is_deleted order.

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 31, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
12e3fc3 
* giteaofficial/main:
  Drop `IDOrderDesc` for listing Actions task and always order by `id DESC` (go-gitea#31150)
  Fix branch order (go-gitea#31174)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 29, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@silverwind silverwind silverwind approved these changes

@yp05327 yp05327 yp05327 approved these changes

@6543 6543 Awaiting requested review from 6543

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/v1.22 This PR should be backported to Gitea 1.22 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/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.23.0
Development

Successfully merging this pull request may close these issues.

branches sording order changed after update
4 participants
@lunny @silverwind @yp05327 @GiteaBot