Skip to content

[10.2.1] Fix avatar path#35531

Merged
micbar merged 4 commits into
release-10.2.1from
release-10.2.1-fix-35311
Jun 14, 2019
Merged

[10.2.1] Fix avatar path#35531
micbar merged 4 commits into
release-10.2.1from
release-10.2.1-fix-35311

Conversation

@patrickjahns

@patrickjahns patrickjahns commented Jun 14, 2019

Copy link
Copy Markdown
Contributor

Description

Backport of #35363

Related Issue

Motivation and Context

Have the fix present in 10.2.1 release

How Has This Been Tested?

  • 🚫 -> needs testing during RC phase

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:

Open tasks:

  • Backport (if applicable set "backport-request" label and remove when the backport was done)

@patrickjahns patrickjahns added this to the QA milestone Jun 14, 2019
@patrickjahns patrickjahns requested review from VicDeo and micbar June 14, 2019 09:00
@@ -0,0 +1,35 @@
@cli @local_storage @TestAlsoOnExternalUserBackend

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Note: the difference with the master and stable10 backports is that maintenance.feature does not already exist back in this "old" release branch. So the whole feature file has to be added here.
If CI passes, then all is good.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

CI fails - it needs some acceptance test code backported. I will look...

@codecov

codecov Bot commented Jun 14, 2019

Copy link
Copy Markdown

Codecov Report

Merging #35531 into release-10.2.1 will decrease coverage by 0.29%.
The diff coverage is 33.82%.

Impacted file tree graph

@@                 Coverage Diff                 @@
##             release-10.2.1   #35531     +/-   ##
===================================================
- Coverage             64.41%   64.11%   -0.3%     
- Complexity            20115    20133     +18     
===================================================
  Files                  1285     1286      +1     
  Lines                 76994    77061     +67     
  Branches               1308     1308             
===================================================
- Hits                  49595    49410    -185     
- Misses                27015    27267    +252     
  Partials                384      384
Flag Coverage Δ Complexity Δ
#javascript 53.66% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.22% <33.82%> (-0.33%) 20133 <18> (+18)
Impacted Files Coverage Δ Complexity Δ
lib/private/Repair.php 81.52% <100%> (+1.75%) 21 <0> (ø) ⬇️
lib/private/Avatar.php 85.71% <100%> (ø) 27 <0> (ø) ⬇️
lib/private/Repair/MoveAvatarIntoSubFolder.php 23.72% <23.72%> (ø) 18 <18> (?)
lib/private/DB/AdapterOCI8.php 0% <0%> (-86.67%) 4% <0%> (ø)
...Builder/ExpressionBuilder/OCIExpressionBuilder.php 0% <0%> (-85.19%) 18% <0%> (ø)
lib/private/DB/OracleMigrator.php 0% <0%> (-80.71%) 29% <0%> (ø)
lib/private/DB/OracleConnection.php 0% <0%> (-66.67%) 12% <0%> (ø)
lib/private/DB/Adapter.php 82.71% <0%> (-6.18%) 25% <0%> (ø)
lib/private/DB/ConnectionFactory.php 78.94% <0%> (-3.95%) 21% <0%> (ø)
lib/private/Repair/RepairMismatchFileCachePath.php 94.57% <0%> (-3.49%) 51% <0%> (ø)
... and 8 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 232243e...f07e85f. Read the comment docs.

1 similar comment
@codecov

codecov Bot commented Jun 14, 2019

Copy link
Copy Markdown

Codecov Report

Merging #35531 into release-10.2.1 will decrease coverage by 0.29%.
The diff coverage is 33.82%.

Impacted file tree graph

@@                 Coverage Diff                 @@
##             release-10.2.1   #35531     +/-   ##
===================================================
- Coverage             64.41%   64.11%   -0.3%     
- Complexity            20115    20133     +18     
===================================================
  Files                  1285     1286      +1     
  Lines                 76994    77061     +67     
  Branches               1308     1308             
===================================================
- Hits                  49595    49410    -185     
- Misses                27015    27267    +252     
  Partials                384      384
Flag Coverage Δ Complexity Δ
#javascript 53.66% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.22% <33.82%> (-0.33%) 20133 <18> (+18)
Impacted Files Coverage Δ Complexity Δ
lib/private/Repair.php 81.52% <100%> (+1.75%) 21 <0> (ø) ⬇️
lib/private/Avatar.php 85.71% <100%> (ø) 27 <0> (ø) ⬇️
lib/private/Repair/MoveAvatarIntoSubFolder.php 23.72% <23.72%> (ø) 18 <18> (?)
lib/private/DB/AdapterOCI8.php 0% <0%> (-86.67%) 4% <0%> (ø)
...Builder/ExpressionBuilder/OCIExpressionBuilder.php 0% <0%> (-85.19%) 18% <0%> (ø)
lib/private/DB/OracleMigrator.php 0% <0%> (-80.71%) 29% <0%> (ø)
lib/private/DB/OracleConnection.php 0% <0%> (-66.67%) 12% <0%> (ø)
lib/private/DB/Adapter.php 82.71% <0%> (-6.18%) 25% <0%> (ø)
lib/private/DB/ConnectionFactory.php 78.94% <0%> (-3.95%) 21% <0%> (ø)
lib/private/Repair/RepairMismatchFileCachePath.php 94.57% <0%> (-3.49%) 51% <0%> (ø)
... and 8 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 232243e...f07e85f. Read the comment docs.

@phil-davis

Copy link
Copy Markdown
Contributor

I added backport of #35280 to get the acceptance test steps for maintenance.feature

@micbar micbar merged commit be297f4 into release-10.2.1 Jun 14, 2019
@delete-merged-branch delete-merged-branch Bot deleted the release-10.2.1-fix-35311 branch June 14, 2019 11:55
@phil-davis phil-davis mentioned this pull request Jun 14, 2019
12 tasks
@davitol davitol mentioned this pull request Jun 25, 2019
11 tasks
@patrickjahns patrickjahns modified the milestone: QA Jun 27, 2019
@phil-davis phil-davis mentioned this pull request Aug 2, 2019
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants