Merge branch 'mainline_develop' into checkout (c74424e4) · 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
c74424e4

Commit c74424e4 authored 9 years ago by

Iryna Lagno

Downloads
- Plain Diff

Merge branch 'mainline_develop' into checkout

parents 21db8d63 06beed02

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Eav/Model/Entity/AbstractEntity.php 1 addition, 1 deletion

app/code/Magento/Eav/Model/Entity/AbstractEntity.php
app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php 2 additions, 1 deletion

.../Paypal/Controller/Express/AbstractExpress/PlaceOrder.php
app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Wysiwyg/Files/DeleteFilesTest.php 104 additions, 0 deletions

...Adminhtml/System/Design/Wysiwyg/Files/DeleteFilesTest.php
app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Wysiwyg/Files/DeleteFolderTest.php 71 additions, 0 deletions

...dminhtml/System/Design/Wysiwyg/Files/DeleteFolderTest.php
app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Wysiwyg/Files/IndexTest.php 39 additions, 0 deletions

...oller/Adminhtml/System/Design/Wysiwyg/Files/IndexTest.php
app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Wysiwyg/Files/OnInsertTest.php 59 additions, 0 deletions

...er/Adminhtml/System/Design/Wysiwyg/Files/OnInsertTest.php
app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php 61 additions, 2 deletions

app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php

with 337 additions and 4 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