Merge branch '2.2-develop' of github.com:magento/magento2 into issue/12342/JSTestDriver-removal (fa69aa50) · 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
fa69aa50

Commit fa69aa50 authored 7 years ago by

Oleksandr Miroshnichenko

Downloads
- Plain Diff

Merge branch '2.2-develop' of github.com:magento/magento2 into issue/12342/JSTestDriver-removal

parents ac8aa21b 83a9b9c9

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Catalog/Model/Product/Image.php 85 additions, 87 deletions

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

...ode/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php
app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_creditmemo_grid.xml 7 additions, 1 deletion

...minhtml/ui_component/sales_order_view_creditmemo_grid.xml
app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_invoice_grid.xml 7 additions, 1 deletion

.../adminhtml/ui_component/sales_order_view_invoice_grid.xml
app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_shipment_grid.xml 7 additions, 1 deletion

...adminhtml/ui_component/sales_order_view_shipment_grid.xml
app/code/Magento/Ui/Component/ExportButton.php 24 additions, 1 deletion

app/code/Magento/Ui/Component/ExportButton.php
app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php 1 addition, 1 deletion

app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
app/code/Magento/Ui/Test/Unit/TemplateEngine/Xhtml/ResultTest.php 97 additions, 0 deletions

.../Magento/Ui/Test/Unit/TemplateEngine/Xhtml/ResultTest.php

with 286 additions and 95 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