merge magento/2.3-develop into magento-mpi/port-2572

Magento CICD · web-flow · commit f4822515c9eb · 2018-07-31T08:57:50.000-07:00
diff --git a/app/code/Magento/Customer/etc/webapi.xml b/app/code/Magento/Customer/etc/webapi.xml
@@ -200,12 +200,6 @@
             <resource ref="anonymous"/>
         </resources>
     </route>
-    <route url="/V1/customers/resetPassword" method="POST">
-        <service class="Magento\Customer\Api\AccountManagementInterface" method="resetPassword"/>
-        <resources>
-            <resource ref="anonymous"/>
-        </resources>
-    </route>
     <route url="/V1/customers/:customerId/confirm" method="GET">
         <service class="Magento\Customer\Api\AccountManagementInterface" method="getConfirmationStatus"/>
         <resources>
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
@@ -178,9 +178,13 @@ require([
                 .loader('show');
             var form = jQuery('#edit_form')
                 .one('invalid-form.validate', function(e){jQuery('body').loader('hide')});
-            newActionUrl = (newActionUrl ? newActionUrl : form.attr('action')) +
-                (form.attr('action').lastIndexOf('?') != -1 ? '&' : '?')+
-                'form_key=' + encodeURIComponent(form.find('[name="form_key"]').val());
+
+            newActionUrl = (newActionUrl ? newActionUrl : form.attr('action'));
+            if (newActionUrl.lastIndexOf('form_key') === -1) {
+                newActionUrl = newActionUrl +
+                    (newActionUrl.lastIndexOf('?') !== -1 ? '&' : '?') +
+                    'form_key=' + encodeURIComponent(form.find('[name="form_key"]').val());
+            }
 
             form.trigger('save', [{
                 action: newActionUrl,
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
@@ -323,6 +323,10 @@ private function addTierPriceData(ProductCollection $productCollection)
      */
     private function removeItemsWithAbsentProducts()
     {
+        if (count($this->_productIds) === 0) {
+            return;
+        }
+
         $productCollection = $this->_productCollectionFactory->create()->addIdFilter($this->_productIds);
         $existingProductsIds = $productCollection->getAllIds();
         $absentProductsIds = array_diff($this->_productIds, $existingProductsIds);
diff --git a/app/code/Magento/Theme/etc/di.xml b/app/code/Magento/Theme/etc/di.xml
@@ -69,7 +69,7 @@
     </type>
     <type name="Magento\Framework\App\Area">
         <arguments>
-            <argument name="translator" xsi:type="object">Magento\Framework\Translate</argument>
+            <argument name="translator" xsi:type="object">Magento\Framework\TranslateInterface</argument>
             <argument name="design" xsi:type="object">Magento\Theme\Model\Design\Proxy</argument>
         </arguments>
     </type>
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml b/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml
@@ -7,6 +7,7 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <head>
+        <meta name="robots" content="NOINDEX,NOFOLLOW"/>
         <css src="jquery/jstree/themes/default/style.css"/>
         <css src="css/styles-old.css"/>
         <css src="css/styles.css"/>
diff --git a/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_email.less b/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_email.less
@@ -203,7 +203,8 @@
         text-align: center;
     }
 
-    .item-price {
+    .item-price,
+    .item-subtotal {
         text-align: right;
     }
 
diff --git a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
@@ -224,7 +224,7 @@
                 .column.main & {
                 }
             }
-
+            display: block;
             margin-bottom: @indent__s;
         }
 
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_email.less b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_email.less
@@ -207,7 +207,8 @@
         text-align: center;
     }
 
-    .item-price {
+    .item-price,
+    .item-subtotal {
         text-align: right;
     }
 
diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,8 @@`
`203`	`203`	`text-align: center;`
`204`	`204`	`}`
`205`	`205`
`206`		`- .item-price {`
	`206`	`+ .item-price,`
	`207`	`+ .item-subtotal {`
`207`	`208`	`text-align: right;`
`208`	`209`	`}`
`209`	`210`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@`
`224`	`224`	`.column.main & {`
`225`	`225`	`}`
`226`	`226`	`}`
`227`		`-`
	`227`	`+ display: block;`
`228`	`228`	`margin-bottom: @indent__s;`
`229`	`229`	`}`
`230`	`230`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,8 @@`
`207`	`207`	`text-align: center;`
`208`	`208`	`}`
`209`	`209`
`210`		`- .item-price {`
	`210`	`+ .item-price,`
	`211`	`+ .item-subtotal {`
`211`	`212`	`text-align: right;`
`212`	`213`	`}`
`213`	`214`