Merge branch 'MAGETWO-60572' into MAGETWO-60453 (09b16f97) · Commits · KIII-12 / Magento · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

M

Magento
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Container Registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

KIII-12
Magento
Commits
09b16f97

Commit 09b16f97 authored 8 years ago by

Iurii Ivashchenko

Downloads
- Plain Diff

Merge branch 'MAGETWO-60572' into MAGETWO-60453

parents d3fbc33b ce7d097e

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js 1 addition, 1 deletion

...ew/frontend/web/js/view/payment/method-renderer/paypal.js
dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.xml 16 additions, 0 deletions

.../Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.xml
dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/PlaceOrderWithPaypalStep.php 51 additions, 1 deletion

...ento/Braintree/Test/TestStep/PlaceOrderWithPaypalStep.php
dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Login.php 12 additions, 0 deletions

...l/tests/app/Magento/Checkout/Test/Block/Onepage/Login.php
dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertBillingAddressAbsentInPayment.php 43 additions, 0 deletions

...t/Test/Constraint/AssertBillingAddressAbsentInPayment.php
dev/tests/functional/tests/app/Magento/Checkout/Test/etc/di.xml 5 additions, 0 deletions

...sts/functional/tests/app/Magento/Checkout/Test/etc/di.xml

with 128 additions and 2 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment