X Tutup
Skip to content

Add capabilities for file locking#37747

Merged
DeepDiver1975 merged 1 commit intomasterfrom
feature/37620
Jul 29, 2020
Merged

Add capabilities for file locking#37747
DeepDiver1975 merged 1 commit intomasterfrom
feature/37620

Conversation

@DeepDiver1975
Copy link
Member

@DeepDiver1975 DeepDiver1975 commented Jul 29, 2020 •
edited
Loading

Description

Add two capabilities

    1. file_locking_support -> general capability
    1. file_locking_enable_file_action - > depending on the setting

Related Issue

Motivation and Context

How Has This Been Tested?

  • test environment:
  • test case 1:
  • test case 2:
  • ...

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

@DeepDiver1975 DeepDiver1975 self-assigned this Jul 29, 2020
@update-docs

This comment has been minimized.

Sign in to view
phil-davis
phil-davis reviewed Jul 29, 2020
View reviewed changes
@DeepDiver1975 DeepDiver1975 changed the base branch from master to release-10.5.0 July 29, 2020 08:50
micbar
micbar reviewed Jul 29, 2020
View reviewed changes
Copy link
Contributor

@micbar micbar left a comment

Choose a reason for hiding this comment

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

Please merge to master. 10.5 is closed

@micbar
Copy link
Contributor

micbar commented Jul 29, 2020

Let us merge #37699 first, then rebase this on master.

@phil-davis
Copy link
Contributor

phil-davis commented Jul 29, 2020

PR #37699 has been merged. @DeepDiver1975 you can rebase back to current master

@DeepDiver1975 DeepDiver1975 changed the base branch from release-10.5.0 to master July 29, 2020 11:49
@DeepDiver1975
Copy link
Member Author

DeepDiver1975 commented Jul 29, 2020

PR #37699 has been merged. @DeepDiver1975 you can rebase back to current master

done

@phil-davis
Copy link
Contributor

phil-davis commented Jul 29, 2020

git-drone was very confused about the base branch for this PR. https://drone.owncloud.com/owncloud/core/26148

I manually forced a rebase and pushed. drone seems to have the right idea now.

@codecov
Copy link

codecov bot commented Jul 29, 2020

Codecov Report

Merging #37747 into master will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master   #37747   +/-   ##
=========================================
  Coverage     64.71%   64.71%           
  Complexity    19386    19386           
=========================================
  Files          1283     1283           
  Lines         75732    75733    +1     
  Branches       1333     1333           
=========================================
+ Hits          49009    49010    +1     
  Misses        26331    26331           
  Partials        392      392
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (ø) 0.00 <ø> (ø)
#phpunit 65.89% <100.00%> (+<0.01%) 19386.00 <0.00> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ Complexity Δ
apps/files/lib/Capabilities.php 100.00% <100.00%> (ø) 2.00 <0.00> (ø)

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 9fd1660...b96bc28. Read the comment docs.

@phil-davis phil-davis requested review from micbar and phil-davis July 29, 2020 13:24
@codecov
Copy link

codecov bot commented Jul 29, 2020

Codecov Report

Merging #37747 into master will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master   #37747   +/-   ##
=========================================
  Coverage     64.71%   64.71%           
  Complexity    19386    19386           
=========================================
  Files          1283     1283           
  Lines         75732    75733    +1     
  Branches       1333     1333           
=========================================
+ Hits          49009    49010    +1     
  Misses        26331    26331           
  Partials        392      392
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (ø) 0.00 <ø> (ø)
#phpunit 65.89% <100.00%> (+<0.01%) 19386.00 <0.00> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ Complexity Δ
apps/files/lib/Capabilities.php 100.00% <100.00%> (ø) 2.00 <0.00> (ø)

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 9fd1660...b96bc28. Read the comment docs.

1 similar comment
@codecov
Copy link

codecov bot commented Jul 29, 2020 •
edited
Loading

Codecov Report

Merging #37747 into master will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master   #37747   +/-   ##
=========================================
  Coverage     64.71%   64.71%           
  Complexity    19386    19386           
=========================================
  Files          1283     1283           
  Lines         75732    75733    +1     
  Branches       1333     1333           
=========================================
+ Hits          49009    49010    +1     
  Misses        26331    26331           
  Partials        392      392
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (ø) 0.00 <ø> (ø)
#phpunit 65.89% <100.00%> (+<0.01%) 19386.00 <0.00> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ Complexity Δ
apps/files/lib/Capabilities.php 100.00% <100.00%> (ø) 2.00 <0.00> (ø)

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 9fd1660...b96bc28. Read the comment docs.

@DeepDiver1975 DeepDiver1975 merged commit 7e8597f into master Jul 29, 2020
@delete-merged-branch delete-merged-branch bot deleted the feature/37620 branch July 29, 2020 14:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@michaelstingl michaelstingl Awaiting requested review from michaelstingl

@phil-davis phil-davis Awaiting requested review from phil-davis

1 more reviewer

@micbar micbar micbar approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@DeepDiver1975 DeepDiver1975

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[10.5.0 RC2] Manual locking feature not exposed via capabilities endpoint

3 participants

@DeepDiver1975 @micbar @phil-davis
X Tutup