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

Edit locally. Do not lock if locking is disabled on the server. #5371

Merged
merged 1 commit into from
Jan 26, 2023

Conversation

allexzander
Copy link
Contributor

Signed-off-by: alex-z [email protected]

@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

@codecov
Copy link

codecov bot commented Jan 26, 2023

Codecov Report

Merging #5371 (bb8bdab) into master (aa74448) will decrease coverage by 0.05%.
The diff coverage is n/a.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #5371      +/-   ##
==========================================
- Coverage   58.29%   58.25%   -0.05%     
==========================================
  Files         141      141              
  Lines       17990    17990              
==========================================
- Hits        10488    10480       -8     
- Misses       7502     7510       +8     
Impacted Files Coverage Δ
src/libsync/propagatorjobs.cpp 77.04% <0.00%> (-1.10%) ⬇️
src/libsync/owncloudpropagator.h 65.32% <0.00%> (-0.81%) ⬇️
src/libsync/propagatedownload.cpp 65.82% <0.00%> (-0.71%) ⬇️

@allexzander allexzander merged commit e332929 into master Jan 26, 2023
@allexzander allexzander deleted the bugfix/do-not-lock-if-lock-is-not-available branch January 26, 2023 17:35
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-5371-bb8bdab19c488c03264ab8e7eeb8021174a4852a-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 added this to the 3.7.0 milestone Jan 30, 2023
@claucambra claucambra mentioned this pull request Feb 3, 2023
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants