Merge branch 'MAGETWO-43957' into MAGETWO-44446 (78a3f3e3) · 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
78a3f3e3

Commit 78a3f3e3 authored 9 years ago by

Ievgen Sentiabov

Downloads
- Plain Diff

Merge branch 'MAGETWO-43957' into MAGETWO-44446

parents f9603135 a4129d9c

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Braintree/Model/PaymentMethod.php 2 additions, 19 deletions

app/code/Magento/Braintree/Model/PaymentMethod.php
app/code/Magento/Braintree/Test/Unit/Model/PaymentMethodTest.php 118 additions, 97 deletions

...e/Magento/Braintree/Test/Unit/Model/PaymentMethodTest.php
app/code/Magento/Sales/Model/Order/Payment.php 2 additions, 10 deletions

app/code/Magento/Sales/Model/Order/Payment.php
app/code/Magento/Sales/Model/Order/Payment/Operations/CaptureOperation.php 38 additions, 35 deletions

...Sales/Model/Order/Payment/Operations/CaptureOperation.php
app/code/Magento/Sales/Model/Order/Payment/Operations/RegisterCaptureNotificationOperation.php 1 addition, 0 deletions

...yment/Operations/RegisterCaptureNotificationOperation.php
app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php 30 additions, 0 deletions

app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php
dev/tests/integration/testsuite/Magento/Paypal/_files/ipn.php 1 addition, 0 deletions

...tests/integration/testsuite/Magento/Paypal/_files/ipn.php
dev/tests/integration/testsuite/Magento/Paypal/_files/order_express.php 17 additions, 26 deletions

...gration/testsuite/Magento/Paypal/_files/order_express.php

with 209 additions and 187 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