Skip to content

[stable13] Do not treat is-encrypted as custom property #9071

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
Merged
rullzer merged 1 commit into from
Apr 5, 2018
Merged

[stable13] Do not treat is-encrypted as custom property #9071

rullzer merged 1 commit into from
Apr 5, 2018

Conversation

@rullzer
Copy link
Member

@rullzer rullzer commented Apr 4, 2018

Backport of #9006

@rullzer
Do not treat is-encrypted as customer property
df09b65 
fixes #8977

Else for all files in a folder we would launch off more queries.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer rullzer added enhancement 3. to review Waiting for reviews labels Apr 4, 2018
@rullzer rullzer added this to the Nextcloud 13.0.2 milestone Apr 4, 2018
MorrisJobke
MorrisJobke approved these changes Apr 4, 2018
View reviewed changes
Copy link
Member

@MorrisJobke MorrisJobke 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 Apr 4, 2018 •
edited
Loading

Codecov Report

Merging #9071 into stable13 will increase coverage by <.01%.
The diff coverage is n/a.

@@              Coverage Diff               @@
##             stable13    #9071      +/-   ##
==============================================
+ Coverage       51.33%   51.34%   +<.01%     
  Complexity      25029    25029              
==============================================
  Files            1609     1609              
  Lines           95305    95305              
  Branches         1376     1376              
==============================================
+ Hits            48924    48930       +6     
+ Misses          46381    46375       -6
Impacted Files Coverage Δ Complexity Δ
...av/lib/Connector/Sabre/CustomPropertiesBackend.php 78.67% <ø> (ø) 29 <0> (ø) ⬇️
apps/files_trashbin/lib/Trashbin.php 72.53% <0%> (+0.24%) 136% <0%> (ø) ⬇️
core/js/js.js 66.29% <0%> (+0.55%) 0% <0%> (ø) ⬇️

@rullzer rullzer requested a review from ChristophWurst April 4, 2018 20:52
@ChristophWurst
Copy link
Member

ChristophWurst commented Apr 5, 2018

1 approving review by reviewers with write access

FYI this should be set to 2 required reviewers in the GitHub branch settings 😉

@rullzer rullzer merged commit 652d041 into stable13 Apr 5, 2018
@rullzer rullzer deleted the backport/9006/ignore_encrypted_custom_properties-13 branch April 5, 2018 06:53
@MorrisJobke MorrisJobke mentioned this pull request Apr 18, 2018
Merged
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@ChristophWurst ChristophWurst ChristophWurst approved these changes

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

@icewind1991 icewind1991 Awaiting requested review from icewind1991

Assignees

No one assigned

Labels

3. to review Waiting for reviews enhancement

Projects

None yet

Milestone

Nextcloud 13.0.2

Development

Successfully merging this pull request may close these issues.

4 participants

@rullzer @ChristophWurst @MorrisJobke