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

Use userFolder instead of rootFolder #36368

Merged
merged 1 commit into from
Nov 5, 2019
Merged

Use userFolder instead of rootFolder #36368

merged 1 commit into from
Nov 5, 2019

Conversation

micbar
Copy link
Contributor

@micbar micbar commented Nov 4, 2019

Description

  • Code Improvements

Motivation and Context

How Has This Been Tested?

  • CI

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Database schema changes (next release will require increase of minor version instead of patch)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:
  • Changelog item, see TEMPLATE

@micbar micbar self-assigned this Nov 4, 2019
@micbar micbar added this to the development milestone Nov 4, 2019
@codecov
Copy link

codecov bot commented Nov 4, 2019

Codecov Report

Merging #36368 into release-10.3.1 will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@                 Coverage Diff                  @@
##             release-10.3.1   #36368      +/-   ##
====================================================
+ Coverage             64.69%   64.69%   +<.01%     
  Complexity            19756    19756              
====================================================
  Files                  1270     1270              
  Lines                 74654    74657       +3     
  Branches               1309     1309              
====================================================
+ Hits                  48297    48300       +3     
  Misses                25971    25971              
  Partials                386      386
Flag Coverage Δ Complexity Δ
#javascript 54% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.87% <100%> (ø) 19756 <1> (ø) ⬇️
Impacted Files Coverage Δ Complexity Δ
lib/private/Files/Meta/MetaRootNode.php 46.51% <100%> (+2.6%) 18 <1> (ø) ⬇️
lib/private/Files/Node/Root.php 56.19% <100%> (+0.42%) 41 <0> (ø) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5888a4b...45a562c. Read the comment docs.

@phil-davis
Copy link
Contributor

Unit tests that use samba are broken because of the changes to owncloudci/php docker image.
Those tests were disabled in master branch so that we could keep working. See issue #36322
This release-10.3.1 branch comes from an earlier point, where the tests are enabled.
We need to disable the tests here to get CI green.

@DeepDiver1975
Copy link
Member

Any commit we can cherry pick into this pr? Thx

@phil-davis
Copy link
Contributor

#36374 should "make CI great again" in 10.3.1 branch.
Then we can rebase here.

@DeepDiver1975
Copy link
Member

#36374 should "make CI great again" in 10.3.1 branch.

Let's rebase this one now ....

@DeepDiver1975
Copy link
Member

Let's rebase this one now ....

done

@micbar micbar merged commit 4705e2f into release-10.3.1 Nov 5, 2019
@delete-merged-branch delete-merged-branch bot deleted the fixfor10.3.1 branch November 5, 2019 12:07
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