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

[stable29] Fix: sorting by date and number #2321

Merged
merged 1 commit into from
Aug 7, 2024

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented May 23, 2024

Backport of #2318

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot backportbot bot requested review from skjnldsv and hamza221 May 23, 2024 08:22
@backportbot backportbot bot added bug Something isn't working 3. to review Waiting for reviews labels May 23, 2024
@backportbot backportbot bot added this to the Nextcloud 29.0.1 milestone May 23, 2024
@skjnldsv
Copy link
Member

/compile amend /

@nextcloud-command nextcloud-command force-pushed the backport/2318/stable29 branch from 086c9c0 to 9429e72 Compare May 23, 2024 08:31
@susnux susnux marked this pull request as ready for review August 6, 2024 20:24
@susnux susnux force-pushed the backport/2318/stable29 branch from 9429e72 to e7d3f09 Compare August 6, 2024 20:24
@susnux susnux added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Aug 6, 2024
@susnux
Copy link
Contributor

susnux commented Aug 6, 2024

/compile amend/

Signed-off-by: Hamza Mahjoubi <hamzamahjoubi221@gmail.com>

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@skjnldsv skjnldsv merged commit ed28d89 into stable29 Aug 7, 2024
31 checks passed
@skjnldsv skjnldsv deleted the backport/2318/stable29 branch August 7, 2024 09:39
@Altahrim Altahrim mentioned this pull request Aug 8, 2024
9 tasks
@hamza221
Copy link
Contributor

hamza221 commented Aug 9, 2024

/backport to stable28

@backportbot backportbot bot added the backport-request Pending backport by the backport-bot label Aug 9, 2024
Copy link
Author

backportbot bot commented Aug 9, 2024

The backport to stable28 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable28
git pull origin stable28

# Create the new backport branch
git checkout -b backport/2321/stable28

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick d4946885

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/2321/stable28

Error: No changes found in backport branch


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish backport-request Pending backport by the backport-bot bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants