Merge remote-tracking branch 'mainline/develop' into public-pull-requests (099038fe) · 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
099038fe

Commit 099038fe authored 9 years ago by

Oleksii Korshenko

Downloads
- Plain Diff

Merge remote-tracking branch 'mainline/develop' into public-pull-requests

parents 245eeaeb 58f3cdc2

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Bundle/view/base/templates/product/price/final_price.phtml 2 additions, 1 deletion

...undle/view/base/templates/product/price/final_price.phtml
app/code/Magento/Catalog/view/base/templates/product/price/default.phtml 2 additions, 1 deletion

...o/Catalog/view/base/templates/product/price/default.phtml
app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml 4 additions, 2 deletions

...talog/view/base/templates/product/price/final_price.phtml
app/code/Magento/Payment/view/frontend/web/js/view/payment/cc-form.js 159 additions, 45 deletions

...ento/Payment/view/frontend/web/js/view/payment/cc-form.js
app/code/Magento/Paypal/etc/frontend/di.xml 1 addition, 0 deletions

app/code/Magento/Paypal/etc/frontend/di.xml
app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php 1 addition, 1 deletion

app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php
app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/TaxTest.php 89 additions, 0 deletions

.../Sales/Test/Unit/Model/Order/Creditmemo/Total/TaxTest.php

with 258 additions and 50 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