Merge branch 'hotline#12812' into 'hotline_6.40' (dba2c2de) · Commits · afi / opacce · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

opacce
- Activity
- Members
- Labels
- Issues
  2
- Issue boards
- Milestones
- Wiki
- Releases
- 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.

afi
opacce
Commits
dba2c2de

Commit dba2c2de authored 11 years ago by

Ghislain Loas

Downloads
- Plain Diff

Merge branch 'hotline#12812' into 'hotline_6.40'

Hotline#12812

parents 9de39bbe beb654b6

Branches

Tags

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

application/modules/admin/views/scripts/catalogue/form.phtml 208 additions, 208 deletions

application/modules/admin/views/scripts/catalogue/form.phtml
application/modules/admin/views/scripts/catalogue/tester.phtml 40 additions, 40 deletions

...cation/modules/admin/views/scripts/catalogue/tester.phtml
tests/application/modules/admin/controllers/CatalogueControllerTest.php 5 additions, 1 deletion

...ion/modules/admin/controllers/CatalogueControllerTest.php

with 253 additions and 249 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