Merge branch 'mainline-develop' into CICD-1375
Showing
- app/code/Magento/Catalog/Model/Observer.php 26 additions, 6 deletionsapp/code/Magento/Catalog/Model/Observer.php
- app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml 2 additions, 2 deletions.../view/adminhtml/templates/product/edit/downloadable.phtml
- app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml 66 additions, 63 deletions...adminhtml/templates/product/edit/downloadable/links.phtml
- app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml 47 additions, 40 deletions...minhtml/templates/product/edit/downloadable/samples.phtml
- app/code/Magento/PageCache/etc/varnish3.vcl 2 additions, 2 deletionsapp/code/Magento/PageCache/etc/varnish3.vcl
- app/code/Magento/PageCache/etc/varnish4.vcl 2 additions, 2 deletionsapp/code/Magento/PageCache/etc/varnish4.vcl
- app/code/Magento/Theme/Block/Html/Topmenu.php 29 additions, 5 deletionsapp/code/Magento/Theme/Block/Html/Topmenu.php
- app/code/Magento/Theme/Test/Unit/Block/Html/TopmenuTest.php 141 additions, 0 deletionsapp/code/Magento/Theme/Test/Unit/Block/Html/TopmenuTest.php
- app/design/adminhtml/Magento/backend/Magento_Downloadable/web/css/source/_module.less 81 additions, 0 deletions.../backend/Magento_Downloadable/web/css/source/_module.less
- app/design/adminhtml/Magento/backend/web/css/override.less 150 additions, 2 deletionsapp/design/adminhtml/Magento/backend/web/css/override.less
- app/design/adminhtml/Magento/backend/web/css/source/forms/_control-table.less 54 additions, 0 deletions.../Magento/backend/web/css/source/forms/_control-table.less
- app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less 2 additions, 1 deletion...nhtml/Magento/backend/web/css/source/forms/_controls.less
- app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less 6 additions, 1 deletion...minhtml/Magento/backend/web/css/source/forms/_fields.less
- app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/_module.less 3 additions, 0 deletions...agento/blank/Magento_Checkout/web/css/source/_module.less
- dev/tests/functional/bootstrap.php 0 additions, 1 deletiondev/tests/functional/bootstrap.php
- dev/tests/functional/composer.json 1 addition, 1 deletiondev/tests/functional/composer.json
- dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/BackendDecorator.php 7 additions, 8 deletions...ento/Mtf/Util/Protocol/CurlTransport/BackendDecorator.php
- dev/tests/functional/phpunit.xml.dist 0 additions, 2 deletionsdev/tests/functional/phpunit.xml.dist
- dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Admin/SuperAdmin.php 2 additions, 2 deletions...sts/app/Magento/Backend/Test/Fixture/Admin/SuperAdmin.php
- dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml 1 addition, 1 deletion...l/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml
Please register or sign in to comment