Merge remote-tracking branch 'origin/MAGETWO-36289' into develop (faa3f709) · 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
faa3f709

There was an error fetching the commit references. Please try again later.

Commit faa3f709 authored 10 years ago by

Joan He

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/MAGETWO-36289' into develop

parents 353c35a3 59e4ff79

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Cms/Block/Adminhtml/Block/Widget/Chooser.php 1 addition, 1 deletion

...code/Magento/Cms/Block/Adminhtml/Block/Widget/Chooser.php
app/code/Magento/Cms/Block/Adminhtml/Page/Widget/Chooser.php 1 addition, 1 deletion

app/code/Magento/Cms/Block/Adminhtml/Page/Widget/Chooser.php
app/code/Magento/Cms/Test/Unit/Block/Adminhtml/Block/Widget/ChooserTest.php 35 additions, 14 deletions

...ms/Test/Unit/Block/Adminhtml/Block/Widget/ChooserTest.php
app/code/Magento/Cms/Test/Unit/Block/Adminhtml/Page/Widget/ChooserTest.php 271 additions, 0 deletions

...Cms/Test/Unit/Block/Adminhtml/Page/Widget/ChooserTest.php

with 308 additions and 16 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