Merge remote-tracking branch 'origin/MAGETWO-49939' into BUGS (14176462) · 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
14176462

Commit 14176462 authored 9 years ago by

Sviatoslav Mankivskyi

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/MAGETWO-49939' into BUGS

Conflicts:
	app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php

parents e59b12f6 8ef687d3

Branches

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Cms/Model/Page/DataProvider.php 4 additions, 5 deletions

app/code/Magento/Cms/Model/Page/DataProvider.php
app/code/Magento/Cms/Model/ResourceModel/AbstractCollection.php 17 additions, 9 deletions

...de/Magento/Cms/Model/ResourceModel/AbstractCollection.php
app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php 0 additions, 26 deletions

.../Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php
app/code/Magento/Cms/Test/Unit/Model/ResourceModel/Block/CollectionTest.php 76 additions, 1 deletion

...ms/Test/Unit/Model/ResourceModel/Block/CollectionTest.php
app/code/Magento/Cms/Test/Unit/Model/ResourceModel/Page/CollectionTest.php 76 additions, 1 deletion

...Cms/Test/Unit/Model/ResourceModel/Page/CollectionTest.php

with 173 additions and 42 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