Skip to content

[10.4] Add new regex config parameter version to blacklisted files and excluded directories#36655

Merged
phil-davis merged 6 commits intorelease-10.4.0from
additional_regex_in_blacklisted_dirs_and_files-for-10.4
Jan 3, 2020
Merged

[10.4] Add new regex config parameter version to blacklisted files and excluded directories#36655
phil-davis merged 6 commits intorelease-10.4.0from
additional_regex_in_blacklisted_dirs_and_files-for-10.4

Conversation

@phil-davis
Copy link
Contributor

Add feature to release-10.4.0

See PR #36360 for the details.

@codecov
Copy link

codecov bot commented Dec 31, 2019

Codecov Report

Merging #36655 into release-10.4.0 will increase coverage by <.01%.
The diff coverage is 77.27%.

Impacted file tree graph

@@                 Coverage Diff                  @@
##             release-10.4.0   #36655      +/-   ##
====================================================
+ Coverage             64.68%   64.68%   +<.01%     
- Complexity            19105    19121      +16     
====================================================
  Files                  1269     1269              
  Lines                 74721    74771      +50     
  Branches               1320     1320              
====================================================
+ Hits                  48333    48368      +35     
- Misses                26000    26015      +15     
  Partials                388      388
Flag Coverage Δ Complexity Δ
#javascript 54.12% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.85% <77.27%> (ø) 19121 <11> (+16) ⬆️
Impacted Files Coverage Δ Complexity Δ
lib/private/Files/Filesystem.php 69.91% <77.27%> (+0.01%) 141 <11> (+16) ⬆️

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 0b043c0...47e68a4. Read the comment docs.

@phil-davis phil-davis force-pushed the additional_regex_in_blacklisted_dirs_and_files-for-10.4 branch from b3268d8 to 9992dbb Compare January 2, 2020 15:50
mmattel and others added 6 commits January 3, 2020 13:01
upload tests for blacklisted_files_regex and excluded_directories_regex

rename tests for blacklisted_files_regex and excluded_directories_regex

move async tests for blacklisted_files_regex and excluded_directories_regex

move folder tests for blacklisted_files_regex and excluded_directories_regex

webUI tests for blacklisted_files_regex and excluded_directories_regex

uploadFileAsyncUsingNewChunking tests for blacklisted_files_regex and excluded_directories_regex

uploadFileUsingNew-and-OldChunking tests for blacklisted_files_regex and excluded_directories_regex
@phil-davis phil-davis force-pushed the additional_regex_in_blacklisted_dirs_and_files-for-10.4 branch from 9a76216 to 47e68a4 Compare January 3, 2020 07:17
@phil-davis phil-davis requested a review from mmattel January 3, 2020 10:18
@phil-davis
Copy link
Contributor Author

Added @mmattel as a reviewer. This has been merged to master today, so we can merge this same code back to 10.4 ( @micbar is happy for it go get into 10.4 )

@phil-davis phil-davis merged commit e9d4e83 into release-10.4.0 Jan 3, 2020
@delete-merged-branch delete-merged-branch bot deleted the additional_regex_in_blacklisted_dirs_and_files-for-10.4 branch January 3, 2020 10:24
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.

2 participants