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

[stable-3.6] Bugfix/conflict resolution when selecting folder #4922

Merged
merged 2 commits into from
Sep 10, 2022

Conversation

backportbot-nextcloud[bot]
Copy link

backport of #4914

…'Finish' button in a Wizard page.

Signed-off-by: alex-z <blackslayer4@gmail.com>
…osed for every folder of the account that has been removed.

Signed-off-by: alex-z <blackslayer4@gmail.com>
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-4922-c0168c780fa486c9c7cb79aa53e52065ce7f3b4e-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.

@sonarqubecloud
Copy link

SonarCloud Quality Gate failed.    Quality Gate failed

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

67.9% 67.9% Coverage
0.0% 0.0% Duplication

@codecov
Copy link

codecov bot commented Sep 10, 2022

Codecov Report

Merging #4922 (c0168c7) into stable-3.6 (6e78f01) will increase coverage by 0.03%.
The diff coverage is 100.00%.

@@              Coverage Diff               @@
##           stable-3.6    #4922      +/-   ##
==============================================
+ Coverage       57.18%   57.21%   +0.03%     
==============================================
  Files             138      138              
  Lines           17133    17134       +1     
==============================================
+ Hits             9797     9803       +6     
+ Misses           7336     7331       -5     
Impacted Files Coverage Δ
src/common/syncjournaldb.cpp 78.17% <100.00%> (+0.31%) ⬆️
src/libsync/propagatedownload.cpp 65.33% <0.00%> (+0.14%) ⬆️

@mgallien mgallien merged commit 5f911a8 into stable-3.6 Sep 10, 2022
@mgallien mgallien deleted the backport/4914/stable-3.6 branch September 10, 2022 10:06
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.

3 participants