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.

Sign up for GitHub

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

Jump to bottom

Fix migration from legacy client when override server url is set #5322

Merged
merged 3 commits into from
Jan 23, 2023
Merged

Fix migration from legacy client when override server url is set #5322

merged 3 commits into from
Jan 23, 2023

Conversation

claucambra
Copy link
Collaborator

No description provided.

@claucambra claucambra self-assigned this Jan 11, 2023
@claucambra claucambra force-pushed the bugfix/old-migration-fix branch from 44133f8 to 7f1fadd Compare January 23, 2023 15:07
@claucambra
Copy link
Collaborator Author

/backport to stable-3.6

@claucambra
More concisely clean paths of trailing slash URLs in restore old conf…
39914e5 
…ig migration method of AccountManager

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Stop checking config to migrate at current path if could not read file
174a486 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Correctly parse account server url when migration from legacy config
c496e73 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra claucambra force-pushed the bugfix/old-migration-fix branch from 7f1fadd to c496e73 Compare January 23, 2023 15:29
@codecov
Copy link

codecov bot commented Jan 23, 2023 •
edited
Loading

Codecov Report

Merging #5322 (c496e73) into master (57a674c) will increase coverage by 0.00%.
The diff coverage is n/a.

Additional details and impacted files 
@@           Coverage Diff           @@
##           master    #5322   +/-   ##
=======================================
  Coverage   57.38%   57.38%           
=======================================
  Files         139      139           
  Lines       17697    17697           
=======================================
+ Hits        10155    10156    +1     
+ Misses       7542     7541    -1
Impacted Files Coverage Δ
src/libsync/vfs/cfapi/cfapiwrapper.cpp 73.18% <0.00%> (+0.22%) ⬆️

@sonarcloud
Copy link

sonarcloud bot commented Jan 23, 2023

SonarCloud Quality Gate failed.    Quality Gate failed

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

0.0% 0.0% Coverage
0.0% 0.0% Duplication

@claucambra claucambra merged commit c5c2e95 into master Jan 23, 2023
@claucambra claucambra deleted the bugfix/old-migration-fix branch January 23, 2023 16:46
@backportbot-nextcloud
Copy link

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

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-5322-c496e73200d9a28e42e569db897a8e0136e596f7-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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@allexzander allexzander allexzander approved these changes

@mgallien mgallien Awaiting requested review from mgallien

@camilasan camilasan Awaiting requested review from camilasan

Assignees

@claucambra claucambra

Labels
backport-request
Projects
None yet
Milestone
3.7.0
Development

Successfully merging this pull request may close these issues.
4 participants
@claucambra @nextcloud-desktop-bot @allexzander @mgallien