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 #34622 and #33180 #34786

Merged
merged 9 commits into from
Mar 18, 2019

Conversation

DeepDiver1975
Copy link
Member

Backport of #34622 and #33180

@codecov
Copy link

codecov bot commented Mar 18, 2019

Codecov Report

Merging #34786 into stable10 will decrease coverage by 19.16%.
The diff coverage is 50%.

Impacted file tree graph

@@               Coverage Diff               @@
##             stable10   #34786       +/-   ##
===============================================
- Coverage        64.2%   45.03%   -19.17%     
===============================================
  Files            1278      116     -1162     
  Lines           76246    11478    -64768     
  Branches         1291     1292        +1     
===============================================
- Hits            48950     5169    -43781     
+ Misses          26917     5930    -20987     
  Partials          379      379
Flag Coverage Δ Complexity Δ
#javascript 53.2% <50%> (-0.02%) 0 <0> (ø)
#phpunit 30.71% <ø> (-34.66%) 0 <ø> (-19883)
Impacted Files Coverage Δ Complexity Δ
core/js/shareitemmodel.js 77.44% <0%> (-0.59%) 0 <0> (ø)
core/js/sharedialogshareelistview.js 78.84% <100%> (ø) 0 <0> (ø) ⬇️
lib/private/Files/Storage/DAV.php 59.45% <0%> (-21.64%) 0% <0%> (ø)
apps/updatenotification/templates/admin.php
lib/private/Encryption/Keys/Storage.php
lib/private/App/CodeChecker/NodeVisitor.php
lib/private/RedisFactory.php
apps/dav/lib/Avatars/AvatarNode.php
...s/dav/appinfo/Migrations/Version20170202213905.php
apps/dav/lib/Upload/ChunkLocationProvider.php
... and 1143 more

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 99798da...6046240. Read the comment docs.

@codecov
Copy link

codecov bot commented Mar 18, 2019

Codecov Report

Merging #34786 into stable10 will increase coverage by 0.02%.
The diff coverage is 73.7%.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #34786      +/-   ##
==============================================
+ Coverage        64.2%   64.23%   +0.02%     
- Complexity      19885    19895      +10     
==============================================
  Files            1278     1277       -1     
  Lines           76256    76242      -14     
  Branches         1291     1292       +1     
==============================================
+ Hits            48958    48971      +13     
+ Misses          26919    26892      -27     
  Partials          379      379
Flag Coverage Δ Complexity Δ
#javascript 53.2% <50%> (-0.02%) 0 <0> (ø)
#phpunit 65.39% <74.06%> (+0.03%) 19895 <52> (+10) ⬆️
Impacted Files Coverage Δ Complexity Δ
...e/AppFramework/DependencyInjection/DIContainer.php 72.88% <ø> (ø) 81 <0> (ø) ⬇️
apps/files_sharing/lib/Notifier.php 100% <ø> (ø) 19 <0> (ø) ⬇️
apps/files_sharing/appinfo/routes.php 97.36% <ø> (-1.14%) 0 <0> (ø)
core/ajax/share.php 0% <0%> (ø) 0 <0> (ø) ⬇️
core/js/shareitemmodel.js 77.44% <0%> (-0.59%) 0 <0> (ø)
apps/files_sharing/lib/AppInfo/Application.php 50.98% <100%> (+9.11%) 17 <1> (+1) ⬆️
...haring/lib/Controller/RequestHandlerController.php 82.18% <100%> (+2.31%) 30 <0> (+4) ⬆️
lib/private/Share20/DefaultShareProvider.php 98.33% <100%> (ø) 114 <0> (ø) ⬇️
core/js/sharedialogshareelistview.js 78.84% <100%> (ø) 0 <0> (ø) ⬇️
...amework/Middleware/Security/SecurityMiddleware.php 93.84% <25%> (-4.52%) 24 <0> (+2)
... and 5 more

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 487394d...79e07ee. Read the comment docs.

@DeepDiver1975 DeepDiver1975 force-pushed the stable10-777fa69a9f05c28b5e0e4a548ee395127803e8fe branch from 6046240 to 4139f08 Compare March 18, 2019 09:29
Copy link
Contributor

@phil-davis phil-davis left a comment

Choose a reason for hiding this comment

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

Just comments related to acceptance tests

tests/acceptance/features/apiAuth/ocsPOSTAuth.feature Outdated Show resolved Hide resolved
tests/acceptance/features/apiAuth/ocsPUTAuth.feature Outdated Show resolved Hide resolved
@DeepDiver1975 DeepDiver1975 force-pushed the stable10-777fa69a9f05c28b5e0e4a548ee395127803e8fe branch from 4139f08 to 79e07ee Compare March 18, 2019 11:22
@DeepDiver1975
Copy link
Member Author

@phil-davis addressed
@PVince81 FYI

Copy link
Contributor

@phil-davis phil-davis left a comment

Choose a reason for hiding this comment

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

Looks OK to me now.
@PVince81 over to you.

@phil-davis phil-davis changed the title Backport of #34622 and #33180 [stable10] Backport of #34622 and #33180 Mar 18, 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.

Looks ok to me as well 👍

@PVince81 PVince81 merged commit c883292 into stable10 Mar 18, 2019
@delete-merged-branch delete-merged-branch bot deleted the stable10-777fa69a9f05c28b5e0e4a548ee395127803e8fe branch March 18, 2019 14:17
@PVince81 PVince81 added this to the QA milestone Apr 12, 2019
@lock lock bot locked as resolved and limited conversation to collaborators Apr 15, 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.

4 participants