Merge remote-tracking branch 'upstream/develop' into pr (5d6fb088) · 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
5d6fb088

Commit 5d6fb088 authored 8 years ago by

Ji Lu

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/develop' into pr

parents f3145eb0 3a43a254

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php 6 additions, 2 deletions

...ontroller/Adminhtml/Product/Initialization/HelperTest.php
lib/internal/Magento/Framework/Data/Argument/Interpreter/ArrayType.php 61 additions, 16 deletions

...Magento/Framework/Data/Argument/Interpreter/ArrayType.php
lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/ArrayTypeTest.php 34 additions, 0 deletions

...ork/Data/Test/Unit/Argument/Interpreter/ArrayTypeTest.php

with 101 additions and 18 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