Merge remote-tracking branch 'mainline/develop' into bugfixes (119a23d1) · 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
119a23d1

Commit 119a23d1 authored 8 years ago by

Olexandr Lysenko

Downloads
- Plain Diff

Merge remote-tracking branch 'mainline/develop' into bugfixes

parents 8a60fa54 152309b5

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/ImportExport/Model/Import.php 4 additions, 1 deletion

app/code/Magento/ImportExport/Model/Import.php
app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php 86 additions, 5 deletions

app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php
dev/tests/integration/testsuite/Magento/Framework/Backup/FilesystemTest.php 50 additions, 0 deletions

...ion/testsuite/Magento/Framework/Backup/FilesystemTest.php
dev/tests/integration/testsuite/Magento/Framework/Backup/_files/var/backups/1474538269_filesystem_code.tgz 0 additions, 0 deletions

.../Backup/_files/var/backups/1474538269_filesystem_code.tgz
dev/tests/integration/testsuite/Magento/Framework/Image/Adapter/InterfaceTest.php 3 additions, 0 deletions

...stsuite/Magento/Framework/Image/Adapter/InterfaceTest.php
lib/internal/Magento/Framework/Backup/Filesystem.php 2 additions, 2 deletions

lib/internal/Magento/Framework/Backup/Filesystem.php

with 145 additions and 8 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