Merge remote-tracking branches...
Merge remote-tracking branches 'remotes/origin/MAGETWO-35603-Test-Failures-When-DB-In-Different-Timezone' and 'remotes/origin/MAGETWO-36450-Phrase-Omits-Placeholder-Values' into MAGETWO-22669-Change-Table-Type-To-InnoDB
Showing
- CHANGELOG.md 58 additions, 22 deletionsCHANGELOG.md
- app/code/Magento/AdminNotification/Setup/InstallSchema.php 2 additions, 2 deletionsapp/code/Magento/AdminNotification/Setup/InstallSchema.php
- app/code/Magento/AdminNotification/composer.json 5 additions, 5 deletionsapp/code/Magento/AdminNotification/composer.json
- app/code/Magento/Authorization/composer.json 3 additions, 3 deletionsapp/code/Magento/Authorization/composer.json
- app/code/Magento/Backend/composer.json 18 additions, 18 deletionsapp/code/Magento/Backend/composer.json
- app/code/Magento/Backup/composer.json 5 additions, 5 deletionsapp/code/Magento/Backup/composer.json
- app/code/Magento/Bundle/Api/Data/LinkInterface.php 18 additions, 15 deletionsapp/code/Magento/Bundle/Api/Data/LinkInterface.php
- app/code/Magento/Bundle/Api/ProductLinkManagementInterface.php 17 additions, 3 deletions...ode/Magento/Bundle/Api/ProductLinkManagementInterface.php
- app/code/Magento/Bundle/Model/Link.php 19 additions, 21 deletionsapp/code/Magento/Bundle/Model/Link.php
- app/code/Magento/Bundle/Model/LinkManagement.php 105 additions, 24 deletionsapp/code/Magento/Bundle/Model/LinkManagement.php
- app/code/Magento/Bundle/Model/OptionRepository.php 54 additions, 21 deletionsapp/code/Magento/Bundle/Model/OptionRepository.php
- app/code/Magento/Bundle/Model/Plugin/BundleLoadOptions.php 4 additions, 1 deletionapp/code/Magento/Bundle/Model/Plugin/BundleLoadOptions.php
- app/code/Magento/Bundle/Model/Plugin/BundleSaveOptions.php 32 additions, 7 deletionsapp/code/Magento/Bundle/Model/Plugin/BundleSaveOptions.php
- app/code/Magento/Bundle/Model/Product/LinksList.php 2 additions, 1 deletionapp/code/Magento/Bundle/Model/Product/LinksList.php
- app/code/Magento/Bundle/Model/Selection.php 2 additions, 0 deletionsapp/code/Magento/Bundle/Model/Selection.php
- app/code/Magento/Bundle/Model/Source/Option/Selection/Price/Type.php 6 additions, 1 deletion...gento/Bundle/Model/Source/Option/Selection/Price/Type.php
- app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php 364 additions, 56 deletions...ode/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php
- app/code/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php 188 additions, 11 deletions...e/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php
- app/code/Magento/Bundle/Test/Unit/Model/Plugin/BundleLoadOptionsTest.php 1 addition, 1 deletion...o/Bundle/Test/Unit/Model/Plugin/BundleLoadOptionsTest.php
- app/code/Magento/Bundle/Test/Unit/Model/Plugin/BundleSaveOptionsTest.php 99 additions, 7 deletions...o/Bundle/Test/Unit/Model/Plugin/BundleSaveOptionsTest.php
Please register or sign in to comment