Merge remote-tracking branch 'falcon/MAGETWO-48516' into MAGETWO-60931 (91beff67) · 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
91beff67

Commit 91beff67 authored 8 years ago by

Oleksandr Shmyheliuk

Downloads
- Plain Diff

Merge remote-tracking branch 'falcon/MAGETWO-48516' into MAGETWO-60931

parents f547c351 dd78e932

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Catalog/Model/Category/DataProvider.php 129 additions, 12 deletions

app/code/Magento/Catalog/Model/Category/DataProvider.php
app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml 11 additions, 22 deletions

...nto/Catalog/view/adminhtml/ui_component/category_form.xml
app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js 1 addition, 0 deletions

...Magento/Ui/view/base/web/js/form/element/file-uploader.js
app/code/Magento/Ui/view/base/web/templates/form/element/uploader/uploader.html 2 additions, 1 deletion

...ew/base/web/templates/form/element/uploader/uploader.html
lib/internal/Magento/Framework/Stdlib/ArrayManager.php 13 additions, 9 deletions

lib/internal/Magento/Framework/Stdlib/ArrayManager.php
lib/internal/Magento/Framework/Stdlib/Test/Unit/ArrayManagerTest.php 33 additions, 3 deletions

...l/Magento/Framework/Stdlib/Test/Unit/ArrayManagerTest.php

with 189 additions and 47 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