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

Bugfix. Files lock. Fix incorrect readonly state. #6660

Merged
merged 1 commit into from
Apr 24, 2024

Conversation

allexzander
Copy link
Contributor

No description provided.

@allexzander allexzander requested a review from mgallien April 22, 2024 20:36
@allexzander
Copy link
Contributor Author

/backport to stable-3.12

@allexzander
Copy link
Contributor Author

/backport to stable-3.13

@mgallien mgallien force-pushed the bugfix/fileslock_incorrect_readonly branch from 1703378 to 47a605c Compare April 24, 2024 11:28
Copy link

Quality Gate Failed Quality Gate failed

Failed conditions
E Maintainability Rating on New Code (required ≥ A)
4 New Code Smells (required ≤ 0)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6660-47a605c654d9344d9effb323ec65bf8b175df222-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@mgallien mgallien merged commit caa4d89 into master Apr 24, 2024
8 of 13 checks passed
@mgallien mgallien deleted the bugfix/fileslock_incorrect_readonly branch April 24, 2024 13:17
Copy link

backportbot bot commented Apr 24, 2024

The backport to stable-3.12 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable-3.12
git pull origin stable-3.12

# Create the new backport branch
git checkout -b backport/6660/stable-3.12

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

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/6660/stable-3.12

Error: Failed to clone repository: Failed to checkout branches: error: Your local changes to the following files would be overwritten by checkout:
src/gui/macOS/ClientCommunicationProtocol.h
Please commit your changes or stash them before you switch branches.
Aborting


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