Merge remote-tracking branch 'troll/MAGETWO-53583' into pull-primary (214c2dae) · 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
214c2dae

Commit 214c2dae authored 8 years ago by

Oleksandr Dubovyk

Downloads
- Plain Diff

Merge remote-tracking branch 'troll/MAGETWO-53583' into pull-primary

parents 4b177e03 91b83fc1

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php 131 additions, 50 deletions

.../Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php 54 additions, 43 deletions

app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php
app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/AbstractAttributeTest.php 25 additions, 11 deletions

...est/Unit/Model/Entity/Attribute/AbstractAttributeTest.php
app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js 1 addition, 1 deletion

app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php 2 additions, 2 deletions

...ite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php
dev/tests/integration/testsuite/Magento/Catalog/_files/dropdown_attribute.php 59 additions, 0 deletions

...n/testsuite/Magento/Catalog/_files/dropdown_attribute.php
dev/tests/integration/testsuite/Magento/Eav/Model/ResourceModel/UpdateHandlerTest.php 257 additions, 0 deletions

...ite/Magento/Eav/Model/ResourceModel/UpdateHandlerTest.php

with 529 additions and 107 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