Skip to content

Conversation

@phil-davis
Copy link
Contributor

Description

These lines were removed in master PR #28603 and backport to stable10 #28610
They came back again accidentally in stable10 PR #28714

Remove them again - they are not in master and are not needed.

How Has This Been Tested?

CI

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:

@codecov
Copy link

codecov bot commented Mar 29, 2019

Codecov Report

Merging #34930 into stable10 will decrease coverage by <.01%.
The diff coverage is n/a.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #34930      +/-   ##
==============================================
- Coverage       64.22%   64.22%   -0.01%     
  Complexity      19905    19905              
==============================================
  Files            1277     1277              
  Lines           76277    76276       -1     
  Branches         1292     1292              
==============================================
- Hits            48992    48991       -1     
  Misses          26906    26906              
  Partials          379      379
Flag Coverage Δ Complexity Δ
#javascript 53.2% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.39% <ø> (-0.01%) 19905 <ø> (ø)
Impacted Files Coverage Δ Complexity Δ
...eratedfilesharing/lib/Controller/OcmController.php 66.06% <0%> (-0.21%) 30% <0%> (ø)
lib/private/Server.php 86.53% <0%> (-0.12%) 253% <0%> (ø)
apps/files_trashbin/lib/Expiration.php 98.27% <0%> (+1.72%) 29% <0%> (ø) ⬇️

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 32437a3...d3ff41c. Read the comment docs.

@phil-davis phil-davis merged commit b2a7453 into stable10 Mar 29, 2019
@delete-merged-branch delete-merged-branch bot deleted the stable10-preseed-config.php branch March 29, 2019 11:44
@lock lock bot locked as resolved and limited conversation to collaborators Apr 2, 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