Merge remote-tracking branch 'upstream/develop' into... (75e550e0) · Commits · KIII-12 / Magento

Commit 75e550e0 authored 8 years ago by

Igor Melnikov

Merge remote-tracking branch 'upstream/develop' into...

Merge remote-tracking branch 'upstream/develop' into MAGETWO-58017-github-error-creating-configurable-products

parents edfb0ab0 2d8fb52c

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/CatalogInventory/Helper/Stock.php 4 additions, 1 deletion

app/code/Magento/CatalogInventory/Helper/Stock.php
dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/StoreForm.php 19 additions, 0 deletions

...o/Backend/Test/Block/System/Store/Edit/Form/StoreForm.php
dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageOnFrontend.php 52 additions, 0 deletions

...p/Magento/Cms/Test/Constraint/AssertCmsPageOnFrontend.php
dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPagePreview.php 4 additions, 2 deletions

.../app/Magento/Cms/Test/Constraint/AssertCmsPagePreview.php
dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.xml 13 additions, 0 deletions

...app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.xml
dev/tests/functional/tests/app/Magento/Cms/Test/etc/di.xml 67 additions, 7 deletions

dev/tests/functional/tests/app/Magento/Cms/Test/etc/di.xml
dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php 88 additions, 0 deletions

...sts/app/Magento/Customer/Test/Block/Form/CustomerForm.php
dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.xml 6 additions, 0 deletions

...sts/app/Magento/Customer/Test/Block/Form/CustomerForm.xml
dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountEdit.xml 1 addition, 0 deletions

...ts/app/Magento/Customer/Test/Page/CustomerAccountEdit.xml
dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertCustomerEmailChanged.php 64 additions, 0 deletions

...o/Security/Test/Constraint/AssertCustomerEmailChanged.php
dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertDefaultAccountInformation.php 58 additions, 0 deletions

...urity/Test/Constraint/AssertDefaultAccountInformation.php
dev/tests/functional/tests/app/Magento/Security/Test/TestCase/SecureChangingCustomerEmailTest.php 88 additions, 0 deletions

...ecurity/Test/TestCase/SecureChangingCustomerEmailTest.php
dev/tests/functional/tests/app/Magento/Security/Test/TestCase/SecureChangingCustomerEmailTest.xml 26 additions, 0 deletions

...ecurity/Test/TestCase/SecureChangingCustomerEmailTest.xml
dev/tests/functional/tests/app/Magento/Security/Test/TestCase/SecureChangingCustomerPasswordTest.php 91 additions, 0 deletions

...rity/Test/TestCase/SecureChangingCustomerPasswordTest.php
dev/tests/functional/tests/app/Magento/Security/Test/TestCase/SecureChangingCustomerPasswordTest.xml 36 additions, 0 deletions

...rity/Test/TestCase/SecureChangingCustomerPasswordTest.xml
dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store/GroupId.php 9 additions, 0 deletions

...al/tests/app/Magento/Store/Test/Fixture/Store/GroupId.php
dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.xml 9 additions, 0 deletions

...ctional/tests/app/Magento/Store/Test/Repository/Store.xml
dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreEntityTest.php 1 addition, 0 deletions

...app/Magento/Store/Test/TestCase/CreateStoreEntityTest.php
dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreEntityTest.xml 4 additions, 5 deletions

...app/Magento/Store/Test/TestCase/CreateStoreEntityTest.xml
dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreGroupEntityTest.php 1 addition, 0 deletions

...agento/Store/Test/TestCase/CreateStoreGroupEntityTest.php

with 641 additions and 15 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'upstream/develop' into...