Merge branch 'develop' of github.corp.ebay.com:magento2/magento2ce into MAGETWO-35665 (48e93313) · 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
48e93313

Commit 48e93313 authored 10 years ago by

Roman Ganin

Downloads
- Plain Diff

Merge branch 'develop' of github.corp.ebay.com:magento2/magento2ce into MAGETWO-35665

parents 2af26fdc 0e589aa8

Branches

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/MediaStorage/Model/File/Storage/Response.php 3 additions, 1 deletion

...code/Magento/MediaStorage/Model/File/Storage/Response.php
dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/TestCase/ControllerAbstractTest.php 4 additions, 12 deletions

...estsuite/Magento/Test/TestCase/ControllerAbstractTest.php
lib/internal/Magento/Framework/App/Response/Http.php 29 additions, 16 deletions

lib/internal/Magento/Framework/App/Response/Http.php
lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php 47 additions, 8 deletions

...nal/Magento/Framework/App/Test/Unit/Response/HttpTest.php
lib/internal/Magento/Framework/Stdlib/DateTime.php 27 additions, 0 deletions

lib/internal/Magento/Framework/Stdlib/DateTime.php
lib/internal/Magento/Framework/Stdlib/DateTime/DateTime.php 2 additions, 0 deletions

lib/internal/Magento/Framework/Stdlib/DateTime/DateTime.php

with 112 additions and 37 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