Merge remote-tracking branch 'magento-goinc/MAGETWO-35379' into last_bugs (0b10f87e) · 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
0b10f87e

Commit 0b10f87e authored 9 years ago by

Michael Logvin

Downloads
- Plain Diff

Merge remote-tracking branch 'magento-goinc/MAGETWO-35379' into last_bugs

parents dddabdaf 567082b5

Branches

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php 3 additions, 3 deletions

...figurableProduct/Block/Product/View/Type/Configurable.php
app/code/Magento/ConfigurableProduct/Helper/Data.php 0 additions, 1 deletion

app/code/Magento/ConfigurableProduct/Helper/Data.php
app/code/Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php 1 addition, 4 deletions

...Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php
app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js 10 additions, 12 deletions

.../ConfigurableProduct/view/frontend/web/js/configurable.js
dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableTest.php 1 addition, 2 deletions

...rableProduct/Block/Product/View/Type/ConfigurableTest.php

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