Merge branch 'develop' into FearlessKiwis-MAGETWO-59785-IncorrectUrls-in-sitemap (a25576df) · 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
a25576df

Commit a25576df authored 8 years ago by

Venkata Uppalapati

Downloads
- Plain Diff

Merge branch 'develop' into FearlessKiwis-MAGETWO-59785-IncorrectUrls-in-sitemap

* develop:
  MAGETWO-62506: Stabilization

parents a91b5514 889ae4af

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Paypal/Model/Express/Checkout.php 25 additions, 1 deletion

app/code/Magento/Paypal/Model/Express/Checkout.php
dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php 2 additions, 2 deletions

...n/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php
dev/tests/integration/testsuite/Magento/Paypal/_files/quote_express.php 95 additions, 0 deletions

...gration/testsuite/Magento/Paypal/_files/quote_express.php
dev/tests/integration/testsuite/Magento/Paypal/_files/quote_express_with_customer.php 77 additions, 0 deletions

...ite/Magento/Paypal/_files/quote_express_with_customer.php
dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payment_express.php 1 addition, 90 deletions

...testsuite/Magento/Paypal/_files/quote_payment_express.php
dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payment_express_with_customer.php 1 addition, 73 deletions

...nto/Paypal/_files/quote_payment_express_with_customer.php

with 201 additions and 166 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