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

[stable10] Backport of Skip shared files when adding recovery key #34506

Merged
merged 1 commit into from
Feb 15, 2019

Conversation

sharidas
Copy link
Contributor

Skip shared files when recovery key is enabled
in the encryption.

Signed-off-by: Sujith H [email protected]

Description

Skip shared files when recovery key is enabled for user(s) in the encryption.

Related Issue

  • Fixes <issue_link>

Motivation and Context

Skip shared files when recovery key is enabled for user(s) in th encryption.

How Has This Been Tested?

  • Verified with the unit test.

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:

Open tasks:

  • Backport (if applicable set "backport-request" label and remove when the backport was done)

Skip shared files when recovery key is enabled
in the encryption.

Signed-off-by: Sujith H <[email protected]>
@sharidas sharidas added this to the development milestone Feb 15, 2019
@sharidas sharidas self-assigned this Feb 15, 2019
Copy link
Contributor

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@codecov
Copy link

codecov bot commented Feb 15, 2019

Codecov Report

Merging #34506 into stable10 will decrease coverage by <.01%.
The diff coverage is 62.5%.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #34506      +/-   ##
==============================================
- Coverage       63.84%   63.84%   -0.01%     
- Complexity      19101    19105       +4     
==============================================
  Files            1264     1264              
  Lines           75355    75363       +8     
  Branches         1292     1292              
==============================================
+ Hits            48110    48115       +5     
- Misses          26865    26868       +3     
  Partials          380      380
Flag Coverage Δ Complexity Δ
#javascript 53.27% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 64.97% <62.5%> (-0.01%) 19105 <2> (+4)
Impacted Files Coverage Δ Complexity Δ
apps/encryption/lib/Recovery.php 78.44% <62.5%> (-1.19%) 41 <2> (+4)

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 a44289a...c0be12c. Read the comment docs.

@phil-davis phil-davis merged commit e2cd975 into stable10 Feb 15, 2019
@delete-merged-branch delete-merged-branch bot deleted the skip-shared-files-stable10 branch February 15, 2019 12:34
@PVince81 PVince81 modified the milestones: development, QA Apr 12, 2019
@phil-davis
Copy link
Contributor

This is the backport of owncloud/encryption#22

@lock lock bot locked as resolved and limited conversation to collaborators Jun 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants