Merge remote-tracking branch 'origin/develop' into MAGETWO-60347 (29744875) · 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
29744875

Commit 29744875 authored 8 years ago by

Dmytro Poperechnyy

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop' into MAGETWO-60347

parents 0718f39e ae9e540a

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Catalog/Model/Product/Image.php 1 addition, 2 deletions

app/code/Magento/Catalog/Model/Product/Image.php
app/code/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php 2 additions, 2 deletions

...ode/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php
app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml 1 addition, 1 deletion

...agento/Newsletter/view/frontend/templates/subscribe.phtml
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 29 additions and 21 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