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

Commit aa445450 authored 9 years ago by

Yu Tang

Downloads
- Plain Diff

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

parents d46c7143 cfdbe775

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/PageCache/Block/Javascript.php 3 additions, 2 deletions

app/code/Magento/PageCache/Block/Javascript.php
app/code/Magento/PageCache/Controller/Block/Render.php 4 additions, 0 deletions

app/code/Magento/PageCache/Controller/Block/Render.php
app/code/Magento/PageCache/Test/Unit/Block/JavascriptTest.php 19 additions, 6 deletions

...code/Magento/PageCache/Test/Unit/Block/JavascriptTest.php
app/code/Magento/PageCache/Test/Unit/Controller/Block/RenderTest.php 8 additions, 5 deletions

...gento/PageCache/Test/Unit/Controller/Block/RenderTest.php
dev/tests/integration/testsuite/Magento/Framework/Url/Helper/DataTest.php 2 additions, 4 deletions

...ation/testsuite/Magento/Framework/Url/Helper/DataTest.php
lib/internal/Magento/Framework/Test/Unit/UrlTest.php 1 addition, 1 deletion

lib/internal/Magento/Framework/Test/Unit/UrlTest.php
lib/internal/Magento/Framework/Url.php 1 addition, 1 deletion

lib/internal/Magento/Framework/Url.php

with 38 additions and 19 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