Merge branch 'MAGETWO-58843-json' into MAGETWO-58446-cache-unserialize (92ab6f31) · 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
92ab6f31

Commit 92ab6f31 authored 8 years ago by

Igor Melnikov

Downloads
- Plain Diff

Merge branch 'MAGETWO-58843-json' into MAGETWO-58446-cache-unserialize

parents 1387eda8 4efeb173

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/etc/di.xml 1 addition, 1 deletion

app/etc/di.xml
lib/internal/Magento/Framework/Serialize/README.md 5 additions, 0 deletions

lib/internal/Magento/Framework/Serialize/README.md
lib/internal/Magento/Framework/Serialize/Serializer/Json.php 3 additions, 1 deletion

lib/internal/Magento/Framework/Serialize/Serializer/Json.php
lib/internal/Magento/Framework/Serialize/SerializerInterface.php 3 additions, 4 deletions

...ernal/Magento/Framework/Serialize/SerializerInterface.php
lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonTest.php 8 additions, 11 deletions

...nto/Framework/Serialize/Test/Unit/Serializer/JsonTest.php

with 20 additions and 17 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