Merge remote-tracking branch 'origin/develop' into MAGETWO-44091 (d60a4cf0) · 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
d60a4cf0

Commit d60a4cf0 authored 9 years ago by

Natalia Momotenko

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop' into MAGETWO-44091

parents 12109bf6 9b1f7f5e

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php 7 additions, 4 deletions

...to/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php
app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php 4 additions, 4 deletions

...de/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
app/code/Magento/ImportExport/view/adminhtml/templates/export/form/after.phtml 2 additions, 2 deletions

...rtExport/view/adminhtml/templates/export/form/after.phtml
app/code/Magento/Integration/Block/Adminhtml/Integration/Tokens.php 1 addition, 1 deletion

...agento/Integration/Block/Adminhtml/Integration/Tokens.php
app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml 1 addition, 1 deletion

...mplates/integration/activate/permissions/tab/webapi.phtml
app/design/adminhtml/Magento/backend/web/css/styles-old.less 12 additions, 2 deletions

app/design/adminhtml/Magento/backend/web/css/styles-old.less

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