Merge remote-tracking branch 'origin/MAGETWO-56943' into pr-mpi-bugfix-ce (348e2623) · 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
348e2623

Commit 348e2623 authored 8 years ago by

isavchuk

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/MAGETWO-56943' into pr-mpi-bugfix-ce

parents 157b5e7c 4361f533

Branches

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/CatalogInventory/Block/Plugin/ProductView.php 1 addition, 1 deletion

...ode/Magento/CatalogInventory/Block/Plugin/ProductView.php
app/code/Magento/CatalogInventory/Test/Unit/Block/Plugin/ProductViewTest.php 3 additions, 3 deletions

...talogInventory/Test/Unit/Block/Plugin/ProductViewTest.php
app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml 0 additions, 1 deletion

...logInventory/view/adminhtml/ui_component/product_form.xml
app/code/Magento/Checkout/Model/Cart.php 1 addition, 2 deletions

app/code/Magento/Checkout/Model/Cart.php

with 5 additions and 7 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