Merge remote-tracking branch 'upstream/develop' into pr (2be4aad6) · 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
2be4aad6

Commit 2be4aad6 authored 8 years ago by

Igor Melnikov

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/develop' into pr

parents eef56cac 2adb6e28

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Catalog/Model/Product.php 12 additions, 1 deletion

app/code/Magento/Catalog/Model/Product.php
app/code/Magento/ConfigurableProduct/Model/LinkManagement.php 99 additions, 2 deletions

...code/Magento/ConfigurableProduct/Model/LinkManagement.php
app/code/Magento/ConfigurableProduct/Test/Unit/Model/LinkManagementTest.php 73 additions, 16 deletions

...onfigurableProduct/Test/Unit/Model/LinkManagementTest.php
app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml 1 addition, 1 deletion

...agento/Newsletter/view/frontend/templates/subscribe.phtml
dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/LinkManagementTest.php 169 additions, 4 deletions

...te/Magento/ConfigurableProduct/Api/LinkManagementTest.php
dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_simple_77.php 4 additions, 1 deletion

.../Magento/ConfigurableProduct/_files/product_simple_77.php
dev/tests/js/JsTestDriver/run_js_tests.php 24 additions, 16 deletions

dev/tests/js/JsTestDriver/run_js_tests.php
lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js 1 addition, 0 deletions

lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js

with 383 additions and 41 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