Merge remote-tracking branch 'origin/MAGETWO-56941' into BUGS (551658fc) · 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
551658fc

Commit 551658fc authored 8 years ago by

Sviatoslav Mankivskyi

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/MAGETWO-56941' into BUGS

parents a54e6480 daedd547

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Customer/Model/Plugin/AllowedCountries.php 2 additions, 0 deletions

app/code/Magento/Customer/Model/Plugin/AllowedCountries.php
app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsites.php 2 additions, 1 deletion

...rceModel/Address/Attribute/Source/CountryWithWebsites.php
app/code/Magento/Customer/Setup/UpgradeData.php 15 additions, 4 deletions

app/code/Magento/Customer/Setup/UpgradeData.php
app/code/Magento/Customer/Test/Unit/Model/Plugin/AllowedCountriesTest.php 2 additions, 2 deletions

.../Customer/Test/Unit/Model/Plugin/AllowedCountriesTest.php
app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsitesTest.php 4 additions, 4 deletions

...odel/Address/Attribute/Source/CountryWithWebsitesTest.php
app/code/Magento/Directory/Model/AllowedCountries.php 4 additions, 4 deletions

app/code/Magento/Directory/Model/AllowedCountries.php

with 29 additions and 15 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