Merge remote-tracking branch 'mainline/develop' into MAGETWO-44154-cg-race-condition (f37a26c9) · 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
f37a26c9

Commit f37a26c9 authored 9 years ago by

Dale Sikkema

Downloads
- Plain Diff

Merge remote-tracking branch 'mainline/develop' into MAGETWO-44154-cg-race-condition

parents c8800d7d e0a56a71

Branches

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php 64 additions, 18 deletions

...CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php
app/code/Magento/GroupedProduct/view/adminhtml/layout/groupedproduct_popup_grid.xml 8 additions, 2 deletions

...oduct/view/adminhtml/layout/groupedproduct_popup_grid.xml
app/code/Magento/GroupedProduct/view/adminhtml/web/js/grouped-product.js 4 additions, 4 deletions

...o/GroupedProduct/view/adminhtml/web/js/grouped-product.js
dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml 0 additions, 1 deletion

...to/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml
dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedShoppingCart.php 1 addition, 0 deletions

.../Constraint/AssertCatalogPriceRuleAppliedShoppingCart.php
dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php 10 additions, 0 deletions

...nal/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php
dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/Search/Grid.php 1 addition, 1 deletion

...inhtml/Product/Grouped/AssociatedProducts/Search/Grid.php

with 88 additions and 26 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