Merge remote-tracking branch... (47692731) · Commits · KIII-12 / Magento

Commit 47692731 authored 10 years ago by

Yuxing Zheng

Merge remote-tracking branch...

Merge remote-tracking branch 'origin/MAGETWO-29555-Incorrect-Path-Type-Format-In-ObjectManager-Calls' into develop

parents 7c25fc1a 9448068c

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php 1 addition, 1 deletion

...to/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php
app/code/Magento/User/Controller/Adminhtml/User/InvalidateToken.php 1 addition, 1 deletion

...agento/User/Controller/Adminhtml/User/InvalidateToken.php
dev/tests/functional/lib/Mtf/App/State/AbstractState.php 1 addition, 1 deletion

dev/tests/functional/lib/Mtf/App/State/AbstractState.php
dev/tests/functional/tests/app/Magento/Store/Test/TestCase/StoreTest.php 1 addition, 1 deletion

...ional/tests/app/Magento/Store/Test/TestCase/StoreTest.php
dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxWithCrossBorderApplying.php 1 addition, 1 deletion

...t/Constraint/AbstractAssertTaxWithCrossBorderApplying.php
dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxRuleTest.php 1 addition, 1 deletion

...ional/tests/app/Magento/Tax/Test/TestCase/TaxRuleTest.php
dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractConfigFiles.php 1 addition, 1 deletion

...rk/Magento/TestFramework/TestCase/AbstractConfigFiles.php
dev/tests/integration/testsuite/Magento/Backend/Block/Widget/GridTest.php 1 addition, 1 deletion

...ation/testsuite/Magento/Backend/Block/Widget/GridTest.php
dev/tests/integration/testsuite/Magento/Backend/Model/AuthTest.php 1 addition, 1 deletion

.../integration/testsuite/Magento/Backend/Model/AuthTest.php
dev/tests/integration/testsuite/Magento/Catalog/Block/Product/NewTest.php 1 addition, 1 deletion

...ation/testsuite/Magento/Catalog/Block/Product/NewTest.php
dev/tests/integration/testsuite/Magento/Catalog/Helper/Product/FlatTest.php 1 addition, 1 deletion

...ion/testsuite/Magento/Catalog/Helper/Product/FlatTest.php
dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Eav/Action/FullTest.php 2 additions, 2 deletions

...nto/Catalog/Model/Indexer/Product/Eav/Action/FullTest.php
dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Eav/Action/RowTest.php 2 additions, 2 deletions

...ento/Catalog/Model/Indexer/Product/Eav/Action/RowTest.php
dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Eav/Action/RowsTest.php 2 additions, 2 deletions

...nto/Catalog/Model/Indexer/Product/Eav/Action/RowsTest.php
dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/Action/FullTest.php 2 additions, 2 deletions

...o/Catalog/Model/Indexer/Product/Price/Action/FullTest.php
dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/Action/RowTest.php 2 additions, 2 deletions

...to/Catalog/Model/Indexer/Product/Price/Action/RowTest.php
dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/Action/RowsTest.php 2 additions, 2 deletions

...o/Catalog/Model/Indexer/Product/Price/Action/RowsTest.php
dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/DataProvider/PriceTest.php 1 addition, 1 deletion

...nto/Catalog/Model/Layer/Filter/DataProvider/PriceTest.php
dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/PriceTest.php 2 additions, 2 deletions

...estsuite/Magento/Catalog/Model/Layer/Filter/PriceTest.php
dev/tests/integration/testsuite/Magento/Catalog/Model/Resource/Product/Link/Product/CollectionTest.php 2 additions, 2 deletions

...og/Model/Resource/Product/Link/Product/CollectionTest.php

with 28 additions and 28 deletions

Please register or to comment

Admin message

Merge remote-tracking branch...