Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGETWO-81090
Showing
- .github/.htaccess 8 additions, 0 deletions.github/.htaccess
- .github/CODE_OF_CONDUCT.md 46 additions, 0 deletions.github/CODE_OF_CONDUCT.md
- .github/CONTRIBUTING.md 0 additions, 0 deletions.github/CONTRIBUTING.md
- .github/ISSUE_TEMPLATE.md 0 additions, 0 deletions.github/ISSUE_TEMPLATE.md
- .github/PULL_REQUEST_TEMPLATE.md 0 additions, 0 deletions.github/PULL_REQUEST_TEMPLATE.md
- .htaccess 0 additions, 9 deletions.htaccess
- .htaccess.sample 0 additions, 9 deletions.htaccess.sample
- app/code/Magento/Catalog/Model/Indexer/Product/Eav/AbstractAction.php 1 addition, 0 deletions...ento/Catalog/Model/Indexer/Product/Eav/AbstractAction.php
- app/code/Magento/Catalog/Model/Product/Option/Value.php 2 additions, 1 deletionapp/code/Magento/Catalog/Model/Product/Option/Value.php
- app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/AbstractActionTest.php 3 additions, 2 deletions...est/Unit/Model/Indexer/Product/Eav/AbstractActionTest.php
- app/code/Magento/Catalog/Test/Unit/Model/Product/Option/ValueTest.php 18 additions, 4 deletions...ento/Catalog/Test/Unit/Model/Product/Option/ValueTest.php
- app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Media.php 1 addition, 1 deletion...alogImportExport/Model/Import/Product/Validator/Media.php
- app/code/Magento/Dhl/Model/Carrier.php 2 additions, 2 deletionsapp/code/Magento/Dhl/Model/Carrier.php
- app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php 63 additions, 0 deletionsapp/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
- app/code/Magento/Dhl/i18n/en_US.csv 2 additions, 2 deletionsapp/code/Magento/Dhl/i18n/en_US.csv
- app/code/Magento/Quote/Model/CouponManagement.php 1 addition, 0 deletionsapp/code/Magento/Quote/Model/CouponManagement.php
- app/code/Magento/Search/Block/Term.php 3 additions, 3 deletionsapp/code/Magento/Search/Block/Term.php
- app/code/Magento/Search/view/frontend/templates/term.phtml 1 addition, 1 deletionapp/code/Magento/Search/view/frontend/templates/term.phtml
- dev/tests/api-functional/testsuite/Magento/Quote/Api/CouponManagementTest.php 42 additions, 0 deletions...onal/testsuite/Magento/Quote/Api/CouponManagementTest.php
- dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_media_existing_images.csv 1 addition, 1 deletion...port/Model/Import/_files/import_media_existing_images.csv
Please register or sign in to comment