Merge remote-tracking branch 'github/develop' into public-pulls (f4089aa8) · 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
f4089aa8

Commit f4089aa8 authored 10 years ago by

Vladimir Pelipenko

Downloads
- Plain Diff

Merge remote-tracking branch 'github/develop' into public-pulls

parents 4ce64b60 bc9d4ad8

Branches

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Catalog/Helper/Product/View.php 5 additions, 3 deletions

app/code/Magento/Catalog/Helper/Product/View.php
app/code/Magento/PageCache/Model/Observer/ProcessLayoutRenderElement.php 1 addition, 1 deletion

...o/PageCache/Model/Observer/ProcessLayoutRenderElement.php
app/code/Magento/Review/Controller/Product/ListAction.php 3 additions, 1 deletion

app/code/Magento/Review/Controller/Product/ListAction.php
lib/internal/Magento/Framework/View/Layout/Reader/Container.php 2 additions, 1 deletion

...ternal/Magento/Framework/View/Layout/Reader/Container.php
lib/internal/Magento/Framework/View/Layout/Reader/Move.php 1 addition, 1 deletion

lib/internal/Magento/Framework/View/Layout/Reader/Move.php
lib/internal/Magento/Framework/View/Layout/Reader/Remove.php 1 addition, 1 deletion

lib/internal/Magento/Framework/View/Layout/Reader/Remove.php
lib/internal/Magento/Framework/View/Page/Config/Reader/Body.php 4 additions, 3 deletions

...ternal/Magento/Framework/View/Page/Config/Reader/Body.php

with 17 additions and 11 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