Merge remote-tracking branch 'mainline/develop' into pr-mpi-bugfix-ce (dd8d126d) · 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
dd8d126d

Commit dd8d126d authored 8 years ago by

isavchuk

Downloads
- Plain Diff

Merge remote-tracking branch 'mainline/develop' into pr-mpi-bugfix-ce

parents 1704f84a b3b6ed4e

Branches

No related merge requests found

Changes 7

Expand all Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php 18 additions, 0 deletions

...gento/Customer/Model/ResourceModel/CustomerRepository.php
app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php 18 additions, 11 deletions

.../Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php
app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php 2 additions, 0 deletions

...gento/Multishipping/Model/Checkout/Type/Multishipping.php
app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php 209 additions, 142 deletions

...pping/Test/Unit/Model/Checkout/Type/MultishippingTest.php
app/code/Magento/ProductVideo/view/frontend/web/js/load-player.js 1 addition, 1 deletion

.../Magento/ProductVideo/view/frontend/web/js/load-player.js
dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/CustomerRepositoryTest.php 38 additions, 0 deletions

...o/Customer/Model/ResourceModel/CustomerRepositoryTest.php
nginx.conf.sample 3 additions, 3 deletions

nginx.conf.sample

with 289 additions and 157 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