Merge remote-tracking branch 'origin/MAGETWO-60611' into pr-develop (1af98b50) · 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
1af98b50

Commit 1af98b50 authored 8 years ago by

Karpenko, Oleksandr

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/MAGETWO-60611' into pr-develop

parents 4bc615fe 8becbc8d

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

lib/internal/Magento/Framework/Filesystem/Directory/Write.php 1 addition, 1 deletion

...internal/Magento/Framework/Filesystem/Directory/Write.php
lib/internal/Magento/Framework/Filesystem/Test/Unit/Directory/WriteTest.php 67 additions, 3 deletions

...to/Framework/Filesystem/Test/Unit/Directory/WriteTest.php
lib/internal/Magento/Framework/View/Asset/MergeStrategy/Direct.php 5 additions, 2 deletions

...nal/Magento/Framework/View/Asset/MergeStrategy/Direct.php
lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeStrategy/DirectTest.php 23 additions, 8 deletions

...amework/View/Test/Unit/Asset/MergeStrategy/DirectTest.php

with 96 additions and 14 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