Merge remote-tracking branch 'goinc/MAGETWO-31647-MAGETWO-31723' into MAGETWO-32346 (ef48e5a3) · 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
ef48e5a3

Commit ef48e5a3 authored 10 years ago by

Vlad Veselov

Downloads
- Plain Diff

Merge remote-tracking branch 'goinc/MAGETWO-31647-MAGETWO-31723' into MAGETWO-32346

parents e25ad0d6 f826a379

Branches

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/Form.php 1 addition, 1 deletion

...de/Magento/Catalog/Block/Adminhtml/Category/Edit/Form.php
app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php 23 additions, 6 deletions

.../Magento/Catalog/Controller/Adminhtml/Category/Delete.php
app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php 1 addition, 0 deletions

...de/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit.phtml 10 additions, 20 deletions

...alog/view/adminhtml/templates/catalog/category/edit.phtml
dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/DeleteTest.php 143 additions, 0 deletions

...ento/Catalog/Controller/Adminhtml/Category/DeleteTest.php

with 178 additions and 27 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