Merge branch 'MAGETWO-32485' into MAGETWO-31191 (6078d066) · 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
6078d066

Commit 6078d066 authored 10 years ago by

Anton Guz

Downloads
- Plain Diff

Merge branch 'MAGETWO-32485' into MAGETWO-31191

parents ae883b8a 680a68fe

Branches

Tags

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/PageCache/view/frontend/requirejs-config.js 2 additions, 7 deletions

app/code/Magento/PageCache/view/frontend/requirejs-config.js
app/code/Magento/PageCache/view/frontend/templates/javascript.phtml 6 additions, 9 deletions

...agento/PageCache/view/frontend/templates/javascript.phtml
app/code/Magento/PageCache/view/frontend/web/js/page-cache.js 218 additions, 36 deletions

...code/Magento/PageCache/view/frontend/web/js/page-cache.js
dev/tests/js/spec/integration/Magento/PageCache/frontend/js/pageCacheSpec.js 340 additions, 0 deletions

...ntegration/Magento/PageCache/frontend/js/pageCacheSpec.js

with 566 additions and 52 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