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

Commit ee6ea1eb authored 7 years ago by

Stanislav Lopukhov

Downloads
- Plain Diff

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

parents b7f80b21 816ec39b

Branches

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/ConfigurableProduct/Model/ResourceModel/Attribute/OptionSelectBuilder.php 6 additions, 0 deletions

...uct/Model/ResourceModel/Attribute/OptionSelectBuilder.php
app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Attribute/OptionSelectBuilderTest.php 38 additions, 3 deletions

...Model/ResourceModel/Attribute/OptionSelectBuilderTest.php
app/code/Magento/Deploy/Console/Command/SetModeCommand.php 3 additions, 0 deletions

app/code/Magento/Deploy/Console/Command/SetModeCommand.php
app/code/Magento/Deploy/Model/Mode.php 19 additions, 0 deletions

app/code/Magento/Deploy/Model/Mode.php
app/code/Magento/Deploy/Test/Unit/Console/Command/SetModeCommandTest.php 12 additions, 0 deletions

...o/Deploy/Test/Unit/Console/Command/SetModeCommandTest.php
app/code/Magento/Translation/Model/Js/DataProvider.php 3 additions, 3 deletions

app/code/Magento/Translation/Model/Js/DataProvider.php
lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/InlineTest.php 1 addition, 1 deletion

...agento/Framework/Phrase/Test/Unit/Renderer/InlineTest.php
nginx.conf.sample 1 addition, 1 deletion

nginx.conf.sample

with 83 additions and 8 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