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

[stable28] fix: Apply checks on shares in the middleware #6487

Merged
merged 1 commit into from
Oct 2, 2024

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Oct 1, 2024

Backport of #6485

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 added this to the Nextcloud 28.0.10 milestone Oct 1, 2024
@max-nextcloud max-nextcloud marked this pull request as ready for review October 1, 2024 20:01
@provokateurin
Copy link
Member

Psalm is not happy :(

@max-nextcloud max-nextcloud force-pushed the backport/6485/stable28 branch 2 times, most recently from 9adddea to 4672b24 Compare October 2, 2024 05:21
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Max <max@nextcloud.com>
Copy link
Collaborator

@max-nextcloud max-nextcloud left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had to replace some NC 29 syntax with the 28 equivalent.
But now psalm is happy and so am i.

@max-nextcloud max-nextcloud mentioned this pull request Oct 2, 2024
2 tasks
@max-nextcloud max-nextcloud merged commit 3524f3a into stable28 Oct 2, 2024
60 checks passed
@max-nextcloud max-nextcloud deleted the backport/6485/stable28 branch October 2, 2024 08:37
@max-nextcloud
Copy link
Collaborator

/backport to stable27

@max-nextcloud
Copy link
Collaborator

/backport to stable26

Copy link
Author

backportbot bot commented Oct 8, 2024

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

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

# Create the new backport branch
git checkout -b backport/6487/stable26

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

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

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants