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 all objectstore related changes #31050

Merged

Conversation

DeepDiver1975
Copy link
Member

@DeepDiver1975 DeepDiver1975 commented Apr 9, 2018

@DeepDiver1975 DeepDiver1975 added this to the development milestone Apr 9, 2018
@DeepDiver1975 DeepDiver1975 self-assigned this Apr 9, 2018
@codecov
Copy link

codecov bot commented Apr 9, 2018

Codecov Report

Merging #31050 into stable10 will increase coverage by 0.07%.
The diff coverage is 64.5%.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #31050      +/-   ##
==============================================
+ Coverage       62.26%   62.34%   +0.07%     
- Complexity      18330    18550     +220     
==============================================
  Files            1205     1210       +5     
  Lines           72219    72607     +388     
  Branches         1274     1272       -2     
==============================================
+ Hits            44970    45266     +296     
- Misses          26871    26962      +91     
- Partials          378      379       +1
Flag Coverage Δ Complexity Δ
#javascript 52.64% <69.56%> (-0.34%) 0 <0> (ø)
#phpunit 63.41% <64.18%> (+0.1%) 18550 <316> (+220) ⬆️
Impacted Files Coverage Δ Complexity Δ
core/routes.php 65.51% <ø> (-4.18%) 0 <0> (ø)
lib/private/Files/Storage/Local.php 79.51% <ø> (-0.98%) 90 <0> (ø)
lib/private/Preview/Font.php 0% <ø> (ø) 1 <0> (ø) ⬇️
lib/private/legacy/template/functions.php 28.07% <ø> (ø) 0 <0> (ø) ⬇️
lib/private/AvatarManager.php 58.33% <ø> (-1.67%) 8 <0> (ø)
apps/dav/lib/Connector/Sabre/Node.php 75% <ø> (ø) 49 <0> (ø) ⬇️
apps/dav/lib/Connector/Sabre/File.php 86.22% <0%> (-0.57%) 114 <1> (+1)
apps/files_trashbin/ajax/preview.php 0% <0%> (ø) 0 <0> (ø) ⬇️
lib/private/Preview/Office.php 0% <0%> (ø) 14 <7> (+3) ⬆️
lib/private/legacy/util.php 69.98% <0%> (-0.72%) 224 <0> (+1)
... and 65 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 785b426...94c18a3. Read the comment docs.

@PVince81
Copy link
Contributor

a wild conflict appears...

@patrickjahns patrickjahns force-pushed the stable10-11c0712ea23070a62020a5dd8b6407db259e5b0d branch from 61272ae to a4b7ee6 Compare June 11, 2018 15:13
@phil-davis
Copy link
Contributor

Added a commit to remove duplicate code that got left behind in tests/integration and another copy of dav-versions.feature - the "real" apiMain/dav-versions.feature has all the deleted scenarios already.

@phil-davis
Copy link
Contributor

I think something is still wrong with:

 >> apiMain suite has undefined steps. Please choose the context to generate snippets:

  [0] None
  [1] FeatureContext
  [2] CardDavContext
  [3] CalDavContext
  [4] AppManagementContext
 > 0

--- Use --snippets-for CLI option to generate snippets for following apiMain suite steps:

    And we save it into "FILEID"

That And we save it into is a Behat built-in thing in BehatVariablesContext. I guess we lost that along the way somewhere recently.

@phil-davis
Copy link
Contributor

Added commit FeatureContext extends \rdx\behatvars\BehatVariablesContext
Something went wrong in conflict resolution in 1 of the other 50 commits, this critical line got missed.
I think it will pass - we will see.

@phil-davis phil-davis force-pushed the stable10-11c0712ea23070a62020a5dd8b6407db259e5b0d branch from d18dcbc to 487eba7 Compare June 11, 2018 17:32
@phil-davis
Copy link
Contributor

Travis has some stupid travis-ci/push thing that does not work - whatever that is about???
At least drone is passing now.

@patrickjahns patrickjahns force-pushed the stable10-11c0712ea23070a62020a5dd8b6407db259e5b0d branch from 487eba7 to 94c18a3 Compare June 11, 2018 19:02
@patrickjahns patrickjahns merged commit ead5147 into stable10 Jun 11, 2018
@patrickjahns patrickjahns deleted the stable10-11c0712ea23070a62020a5dd8b6407db259e5b0d branch June 11, 2018 19:41
@phil-davis
Copy link
Contributor

Good that this is finally merged. In future we should try very hard not to have big changes like this that wait a long time until someone decides they should be backported, and other dependent changes pile up behind and...
"semver" should help because we would make a new/fresh release branch (e.g. 10.1) for such a thing, and not attempt to backport it.

@DeepDiver1975 re: commits - I know all about rebasing and squashing "fix" commits into the original commits where they belong. For those last 2 commits, it was late at night here and I wanted to just prove the fixes. Then I intended to try and find the commits (among the other 49) where the conflict resolution had gone wrong in the past and apply the fixes to those commits. That is a bit tedious (looking at the content of each commit in the history to find ones that went wrong), so I left it for after sleep. In the meantime the PR has been merged. So it is too late now - those last 2 commits are on the stable10 branch.

@PVince81
Copy link
Contributor

PVince81 commented Oct 15, 2018

@lock lock bot locked as resolved and limited conversation to collaborators Oct 15, 2019
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.

9 participants