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

Commit f5e521bc authored 8 years ago by

Leonid Poluyanov

Downloads
- Plain Diff

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

parents 65443128 bbb180fa

Branches

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

dev/tests/functional/lib/Magento/Mtf/Client/Element/LiselectstoreElement.php 1 addition, 1 deletion

...l/lib/Magento/Mtf/Client/Element/LiselectstoreElement.php
dev/tests/functional/phpunit.xml.dist 1 addition, 0 deletions

dev/tests/functional/phpunit.xml.dist
dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Source/Date.php 28 additions, 1 deletion

...al/tests/app/Magento/Backend/Test/Fixture/Source/Date.php
dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.xml 4 additions, 0 deletions

...ento/Catalog/Test/Block/Adminhtml/Product/ProductForm.xml
dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml 1 addition, 0 deletions

...app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml
dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml 30 additions, 0 deletions

.../Magento/Catalog/Test/Repository/CatalogProductSimple.xml
dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/ConfigData.xml 16 additions, 0 deletions

.../tests/app/Magento/Catalog/Test/Repository/ConfigData.xml

with 81 additions and 2 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