Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-83402-PR-11592 (b5108577) · 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
b5108577

Commit b5108577 authored 7 years ago by

Stanislav Idolov

Downloads
- Plain Diff

Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-83402-PR-11592

parents 2a83983f b05a9575

Branches

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Integration/etc/acl.xml 20 additions, 0 deletions

app/code/Magento/Integration/etc/acl.xml
app/code/Magento/Robots/Controller/Index/Index.php 1 addition, 0 deletions

app/code/Magento/Robots/Controller/Index/Index.php
app/code/Magento/Robots/Test/Unit/Controller/Index/IndexTest.php 3 additions, 0 deletions

...e/Magento/Robots/Test/Unit/Controller/Index/IndexTest.php
app/code/Magento/Wishlist/view/frontend/layout/wishlist_email_rss.xml 1 addition, 3 deletions

...ento/Wishlist/view/frontend/layout/wishlist_email_rss.xml
dev/tests/integration/testsuite/Magento/Framework/App/Language/_files/bar/en_gb/1.csv 2 additions, 1 deletion

...ite/Magento/Framework/App/Language/_files/bar/en_gb/1.csv
lib/internal/Magento/Framework/App/Language/Dictionary.php 3 additions, 1 deletion

lib/internal/Magento/Framework/App/Language/Dictionary.php

with 30 additions and 5 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