Skip to content

Conversation

@ArtificialOwl
Copy link
Member

Fix the rewrite rules about ocm-provider in 2 locations:

  • the default .htaccess,
  • the generated part of htaccess from Setup.php

I were only able to reproduce the issue in some conditions, each time it seems that this patch fixed them.

Signed-off-by: Maxence Lange <[email protected]>
@blizzz blizzz requested a review from szaimen October 2, 2023 15:52
@nickvergessen nickvergessen added the pending documentation This pull request needs an associated documentation update label Oct 2, 2023
@ArtificialOwl ArtificialOwl mentioned this pull request Oct 2, 2023
10 tasks
@sorbaugh sorbaugh self-requested a review October 2, 2023 19:31
Co-authored-by: Benjamin Gaussorgues <[email protected]>
Signed-off-by: Maxence Lange <[email protected]>
Copy link
Collaborator

@Altahrim Altahrim left a comment

Choose a reason for hiding this comment

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

Not tested, but LGTM

@nickvergessen
Copy link
Member

@ArtificialOwl can you install an older version and then update, to see if the htaccess change is correctly handled by the updater?

@blizzz
Copy link
Member

blizzz commented Oct 5, 2023

/backport to stable27

@blizzz
Copy link
Member

blizzz commented Oct 5, 2023

/backport to stable26

@blizzz blizzz added bug 4. to release Ready to be released and/or waiting for tests to finish labels Oct 5, 2023
@blizzz blizzz added this to the Nextcloud 28 milestone Oct 5, 2023
@blizzz blizzz merged commit 6200c91 into master Oct 5, 2023
@blizzz blizzz deleted the fix/noid/ocm-provider-rewrite-rules branch October 5, 2023 08:24
@backportbot-nextcloud
Copy link

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

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

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

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 bug pending documentation This pull request needs an associated documentation update

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants