Merge branch '2.2-develop' of https://github.com/magento/magento2ce into MAGETWO-81090 (2dbf7825) · 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
2dbf7825

Commit 2dbf7825 authored 7 years ago by

Andrii Voskoboinikov

Downloads
- Plain Diff

Merge branch '2.2-develop' of https://github.com/magento/magento2ce into MAGETWO-81090

parents 96b4755b 4d4e88a8

Changes 108

Expand all Hide whitespace changes

Inline Side-by-side

Showing

dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php 51 additions, 3 deletions

...ion/testsuite/Magento/Quote/Model/QuoteManagementTest.php
dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_bundle_rollback.php 14 additions, 10 deletions

...suite/Magento/Sales/_files/quote_with_bundle_rollback.php
dev/tests/js/jasmine/tests/app/code/Magento/InstantPurchase/frontend/web/js/view/instant-purchase.test.js 102 additions, 0 deletions

...antPurchase/frontend/web/js/view/instant-purchase.test.js
dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php 61 additions, 2 deletions

.../static/testsuite/Magento/Test/Integrity/ComposerTest.php
dev/tests/unit/phpunit.xml.dist 1 addition, 1 deletion

dev/tests/unit/phpunit.xml.dist
lib/internal/Magento/Framework/Model/AbstractModel.php 4 additions, 4 deletions

lib/internal/Magento/Framework/Model/AbstractModel.php
lib/internal/Magento/Framework/Session/SessionManager.php 1 addition, 11 deletions

lib/internal/Magento/Framework/Session/SessionManager.php
lib/internal/Magento/Framework/composer.json 4 additions, 4 deletions

lib/internal/Magento/Framework/composer.json

with 238 additions and 35 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