[stable24] fix: catch ManuallyLockedException and use app context#38120
Closed
max-nextcloud wants to merge 1 commit intostable24from
Closed
[stable24] fix: catch ManuallyLockedException and use app context#38120max-nextcloud wants to merge 1 commit intostable24from
max-nextcloud wants to merge 1 commit intostable24from
Conversation
The files_lock app may throw ManuallyLockedExceptions when attempting to revert a file that is currently opened. This would prevent the user from rolling back a opened file. Text and Richdocuments handle changes of the file while editing. Allow reverting files even when they are locked by these apps and let the apps handle the conflict. Signed-off-by: Max <max@nextcloud.com>
max-nextcloud
requested review from
ChristophWurst,
miaulalala,
nickvergessen and
tcitworld
as code owners
max-nextcloud
removed request for
ChristophWurst,
miaulalala,
nickvergessen and
tcitworld
Contributor
Author
|
Phew... picking the proper base branch means far less changes. 🙉 Sorry for the noise to everyone who was assigned as a reviewer due to being in the |
Member
|
Drone can not handle changing the target branch. You need to create a new commit at least, but maybe even a new PR, don't remember. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Checklist