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

Commit 56cd1b76 authored 10 years ago by

Ghislain Loas

Downloads
- Plain Diff

Merge branch 'stable' into hotline-master

Conflicts:
	.htaccess
	VERSIONS
	library/startup.php

parents 6d15cddd 7615d4d6

Branches

Tags

3 merge requests!896Master,!800Master,!798Hotline master

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

.htaccess 29 additions, 27 deletions

.htaccess
VERSIONS 18 additions, 0 deletions

VERSIONS
application/modules/admin/controllers/IndexController.php 0 additions, 6 deletions

application/modules/admin/controllers/IndexController.php
application/modules/admin/views/scripts/index/index.phtml 2 additions, 6 deletions

application/modules/admin/views/scripts/index/index.phtml
library/startup.php 1 addition, 1 deletion

library/startup.php
tests/application/modules/admin/controllers/AdminIndexControllerTest.php 0 additions, 65 deletions

...on/modules/admin/controllers/AdminIndexControllerTest.php

with 50 additions and 105 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