Merge remote-tracking branch 'mainline/develop' into publication (11b0262f) · 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
11b0262f

Commit 11b0262f authored 10 years ago by

Vladimir Pelipenko

Downloads
- Plain Diff

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

parents 64a74302 bee1a30a

Branches

No related merge requests found

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/PageCache/etc/varnish3.vcl 2 additions, 2 deletions

app/code/Magento/PageCache/etc/varnish3.vcl
app/code/Magento/PageCache/etc/varnish4.vcl 2 additions, 2 deletions

app/code/Magento/PageCache/etc/varnish4.vcl
dev/tests/static/testsuite/Magento/Test/Integrity/HhvmCompatibilityTest.php 1 addition, 0 deletions

...estsuite/Magento/Test/Integrity/HhvmCompatibilityTest.php
dev/tools/performance-toolkit/benchmark.jmx 322 additions, 115 deletions

dev/tools/performance-toolkit/benchmark.jmx
dev/tools/performance-toolkit/generate.php 18 additions, 0 deletions

dev/tools/performance-toolkit/generate.php
lib/internal/Magento/Framework/Code/Minifier/Adapter/Css/CssMinifier.php 10 additions, 1 deletion

...gento/Framework/Code/Minifier/Adapter/Css/CssMinifier.php

with 355 additions and 120 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