merge magento/2.3-develop into magento-obsessive-owls/cms-team-1-delivery-sprint-12

Magento CICD · web-flow · commit 3863ed3248f7 · 2018-07-31T08:48:14.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/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`