Merge remote-tracking branch 'magento-troll/MAGETWO-33690' into UI (7cd51cba) · 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
7cd51cba

Commit 7cd51cba authored 10 years ago by

Natalia Momotenko

Downloads
- Plain Diff

Merge remote-tracking branch 'magento-troll/MAGETWO-33690' into UI

parents 5a452ba9 fe4e78e3

Branches

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php 27 additions, 2 deletions

...ode/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php
app/code/Magento/CatalogRule/Model/Rule.php 37 additions, 0 deletions

app/code/Magento/CatalogRule/Model/Rule.php
app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/AbstractIndexerTest.php 45 additions, 1 deletion

...talogRule/Test/Unit/Model/Indexer/AbstractIndexerTest.php
app/code/Magento/CatalogRule/Test/Unit/Model/RuleTest.php 86 additions, 1 deletion

app/code/Magento/CatalogRule/Test/Unit/Model/RuleTest.php

with 195 additions and 4 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