Merge branch 'hotline-master' into 'master' (e583c0cd) · 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
e583c0cd

Commit e583c0cd authored 9 years ago by

Patrick Barroca

Downloads
- Plain Diff

Merge branch 'hotline-master' into 'master'

Hotline master

See merge request !849

parents f86657ed 2a5fee93

Branches

Tags

2 merge requests!896Master,!850Master

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_HOTLINE/24646 1 addition, 0 deletions

VERSIONS_HOTLINE/24646
application/modules/admin/controllers/CmsController.php 5 additions, 2 deletions

application/modules/admin/controllers/CmsController.php
tests/application/modules/admin/controllers/CmsControllerListModeTest.php 41 additions, 1 deletion

...n/modules/admin/controllers/CmsControllerListModeTest.php
tests/application/modules/admin/controllers/CmsControllerTest.php 2 additions, 1 deletion

...plication/modules/admin/controllers/CmsControllerTest.php

with 49 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