Merge remote-tracking branch 'mainline/develop' into jsonapi_compliant (69e8c163) · 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
69e8c163

Commit 69e8c163 authored 9 years ago by

Serhiy Shkolyarenko

Downloads
- Plain Diff

Merge remote-tracking branch 'mainline/develop' into jsonapi_compliant

parents ad551398 e3593aef

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Catalog/Model/Category.php 3 additions, 2 deletions

app/code/Magento/Catalog/Model/Category.php
app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php 30 additions, 10 deletions

app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php
app/code/Magento/Checkout/view/frontend/web/js/sidebar.js 5 additions, 1 deletion

app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js 3 additions, 1 deletion

...de/Magento/Checkout/view/frontend/web/js/view/minicart.js
app/code/Magento/Customer/Model/Cart/ConfigPlugin.php 37 additions, 0 deletions

app/code/Magento/Customer/Model/Cart/ConfigPlugin.php
app/code/Magento/Customer/Model/Checkout/ConfigProvider.php 73 additions, 0 deletions

app/code/Magento/Customer/Model/Checkout/ConfigProvider.php
app/code/Magento/Customer/etc/frontend/di.xml 3 additions, 0 deletions

app/code/Magento/Customer/etc/frontend/di.xml
app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js 1 addition, 1 deletion

.../Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js

with 155 additions and 15 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