Merge remote-tracking branch 'mainline/develop' into SPRINT-26-NORD (099a85c1) · 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
099a85c1

Commit 099a85c1 authored 8 years ago by

Leonid Poluyanov

Downloads
- Plain Diff

Merge remote-tracking branch 'mainline/develop' into SPRINT-26-NORD

parents 2703dea7 e6ccdcc3

Branches

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/SalesInventory/composer.json 1 addition, 1 deletion

app/code/Magento/SalesInventory/composer.json
app/code/Magento/Ui/view/base/web/js/form/element/date.js 10 additions, 11 deletions

app/code/Magento/Ui/view/base/web/js/form/element/date.js
app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_toolbar.less 5 additions, 3 deletions

...blank/Magento_Catalog/web/css/source/module/_toolbar.less
composer.json 1 addition, 1 deletion

composer.json
composer.lock 80 additions, 77 deletions

composer.lock
dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php 17 additions, 2 deletions

...nto/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date-time.test.js 41 additions, 0 deletions

...pp/code/Magento/Ui/base/js/form/element/date-time.test.js
dev/tests/js/jasmine/tests/lib/mage/misc.test.js 1 addition, 1 deletion

dev/tests/js/jasmine/tests/lib/mage/misc.test.js
lib/web/mage/utils/misc.js 0 additions, 1 deletion

lib/web/mage/utils/misc.js

with 156 additions and 97 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