Merge remote-tracking branch 'mainline/develop' into NORD-PR (68928b33) · 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
68928b33

Commit 68928b33 authored 8 years ago by

Leonid Poluyanov

Downloads
- Plain Diff

Merge remote-tracking branch 'mainline/develop' into NORD-PR

parents a6327e9c 2e228234

Branches

Changes 8

Expand all Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Ui/Component/Form/Element/DataType/Date.php 2 additions, 1 deletion

app/code/Magento/Ui/Component/Form/Element/DataType/Date.php
app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/DateTest.php 2 additions, 5 deletions

...Ui/Test/Unit/Component/Form/Element/DataType/DateTest.php
app/code/Magento/Ui/view/base/web/js/form/element/date.js 26 additions, 2 deletions

app/code/Magento/Ui/view/base/web/js/form/element/date.js
dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date.test.js 637 additions, 2 deletions

...sts/app/code/Magento/Ui/base/js/form/element/date.test.js
dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt 0 additions, 1 deletion

...ic/testsuite/Magento/Test/Js/_files/blacklist/magento.txt
lib/internal/Magento/Framework/HTTP/Adapter/Curl.php 1 addition, 2 deletions

lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
lib/internal/Magento/Framework/HTTP/Client/Curl.php 4 additions, 4 deletions

lib/internal/Magento/Framework/HTTP/Client/Curl.php
setup/performance-toolkit/benchmark.jmx 4 additions, 4 deletions

setup/performance-toolkit/benchmark.jmx

with 676 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