Merge remote-tracking branch 'mainlineCE/develop' into PR_Branch (1be4885c) · 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
1be4885c

There was an error fetching the commit references. Please try again later.

Commit 1be4885c authored 9 years ago by

Maddy Chellathurai

Downloads
- Plain Diff

Merge remote-tracking branch 'mainlineCE/develop' into PR_Branch

parents f75926dd aad945ce

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/bulk.js 1 addition, 0 deletions

...bleProduct/view/adminhtml/web/js/variations/steps/bulk.js
app/code/Magento/Downloadable/Model/Product/Type.php 1 addition, 1 deletion

app/code/Magento/Downloadable/Model/Product/Type.php
app/code/Magento/Search/view/frontend/templates/form.mini.phtml 1 addition, 1 deletion

...de/Magento/Search/view/frontend/templates/form.mini.phtml
app/code/Magento/Theme/Block/Html/Topmenu.php 10 additions, 1 deletion

app/code/Magento/Theme/Block/Html/Topmenu.php
dev/tests/integration/testsuite/Magento/GroupedProduct/Model/ResourceModel/Product/Type/Grouped/AssociatedProductsCollectionTest.php 4 additions, 3 deletions

...Product/Type/Grouped/AssociatedProductsCollectionTest.php

with 17 additions and 6 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