Merge remote-tracking branch 'mainline/develop' into MAGETWO-52660 (b45b3cb1) · 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
b45b3cb1

Commit b45b3cb1 authored 8 years ago by

Michail Slabko

Downloads
- Plain Diff

Merge remote-tracking branch 'mainline/develop' into MAGETWO-52660

parents cd1b0da9 1ade3b76

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Email/Model/Template/Css/Processor.php 67 additions, 0 deletions

app/code/Magento/Email/Model/Template/Css/Processor.php
app/code/Magento/Email/Model/Template/Filter.php 49 additions, 2 deletions

app/code/Magento/Email/Model/Template/Filter.php
app/code/Magento/Email/Test/Unit/Model/Template/Css/ProcessorTest.php 59 additions, 0 deletions

...ento/Email/Test/Unit/Model/Template/Css/ProcessorTest.php
app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php 93 additions, 6 deletions

...ode/Magento/Email/Test/Unit/Model/Template/FilterTest.php
lib/internal/Magento/Framework/View/Asset/NotationResolver/Variable.php 5 additions, 2 deletions

...agento/Framework/View/Asset/NotationResolver/Variable.php
lib/internal/Magento/Framework/View/Test/Unit/Asset/NotationResolver/VariableTest.php 23 additions, 15 deletions

...rk/View/Test/Unit/Asset/NotationResolver/VariableTest.php

with 296 additions and 25 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