Merge remote-tracking branch 'remotes/mainline/develop' into... (2489d637) · Commits · KIII-12 / Magento

Commit 2489d637 authored 9 years ago by

Cari Spruiell

Merge remote-tracking branch 'remotes/mainline/develop' into...

Merge remote-tracking branch 'remotes/mainline/develop' into MAGETWO-37843-responsive-email-templates-in-blank-theme

parents 7a6eaed7 8892f351

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php 36 additions, 60 deletions

...ento/Authorizenet/Controller/Directpost/Payment/Place.php
app/code/Magento/Authorizenet/Helper/DataFactory.php 4 additions, 2 deletions

app/code/Magento/Authorizenet/Helper/DataFactory.php
app/code/Magento/Authorizenet/Model/Directpost/Session.php 15 additions, 1 deletion

app/code/Magento/Authorizenet/Model/Directpost/Session.php
app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php 50 additions, 104 deletions

...net/Test/Unit/Controller/Directpost/Payment/PlaceTest.php
app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/SessionTest.php 58 additions, 0 deletions

...o/Authorizenet/Test/Unit/Model/Directpost/SessionTest.php
app/code/Magento/Catalog/Api/ProductRepositoryInterface.php 0 additions, 6 deletions

app/code/Magento/Catalog/Api/ProductRepositoryInterface.php
app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php 10 additions, 0 deletions

...oduct/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
app/code/Magento/Catalog/Model/ProductRepository.php 1 addition, 93 deletions

app/code/Magento/Catalog/Model/ProductRepository.php
app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php 0 additions, 134 deletions

...Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php
app/code/Magento/Catalog/etc/webapi.xml 0 additions, 6 deletions

app/code/Magento/Catalog/etc/webapi.xml
app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php 15 additions, 1 deletion

app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexBuilderTest.php 40 additions, 2 deletions

.../CatalogRule/Test/Unit/Model/Indexer/IndexBuilderTest.php
app/code/Magento/CatalogSearch/Model/Indexer/IndexStructure.php 1 addition, 1 deletion

...de/Magento/CatalogSearch/Model/Indexer/IndexStructure.php
app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandler.php 2 additions, 2 deletions

...de/Magento/CatalogSearch/Model/Indexer/IndexerHandler.php
app/code/Magento/CatalogSearch/Model/Indexer/Mview/Action.php 42 additions, 0 deletions

...code/Magento/CatalogSearch/Model/Indexer/Mview/Action.php
app/code/Magento/CatalogSearch/Model/Resource/Engine.php 3 additions, 3 deletions

app/code/Magento/CatalogSearch/Model/Resource/Engine.php
app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php 1 addition, 2 deletions

app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php
app/code/Magento/CatalogSearch/Test/Unit/Model/Search/IndexBuilderTest.php 1 addition, 1 deletion

...CatalogSearch/Test/Unit/Model/Search/IndexBuilderTest.php
app/code/Magento/CatalogSearch/Test/Unit/Model/Search/Indexer/IndexStructureTest.php 3 additions, 3 deletions

...rch/Test/Unit/Model/Search/Indexer/IndexStructureTest.php
app/code/Magento/CatalogSearch/etc/mview.xml 1 addition, 1 deletion

app/code/Magento/CatalogSearch/etc/mview.xml

with 283 additions and 422 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'remotes/mainline/develop' into...