Merge branch 'hotline#47683_right_index_article_in_domain' into 'hotline-master' (c1f33c93) · 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
c1f33c93

Commit c1f33c93 authored 8 years ago by

Patrick Barroca

Downloads
- Plain Diff

Merge branch 'hotline#47683_right_index_article_in_domain' into 'hotline-master'

Hotline#47683 right index article in domain

See merge request !1883

parents 022ed2c4 7064d1e5

Branches

Tags

2 merge requests!1902Master,!1896Master

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_HOTLINE/47683 1 addition, 0 deletions

VERSIONS_HOTLINE/47683
application/modules/admin/controllers/CatalogueController.php 1 addition, 7 deletions

...ication/modules/admin/controllers/CatalogueController.php
library/Class/UserGroup.php 40 additions, 36 deletions

library/Class/UserGroup.php
library/ZendAfi/Acl/AdminControllerGroup.php 1 addition, 0 deletions

library/ZendAfi/Acl/AdminControllerGroup.php
tests/application/modules/admin/controllers/CatalogueControllerTest.php 66 additions, 0 deletions

...ion/modules/admin/controllers/CatalogueControllerTest.php
tests/application/modules/admin/controllers/CmsControllerTest.php 0 additions, 2 deletions

...plication/modules/admin/controllers/CmsControllerTest.php
tests/application/modules/admin/controllers/UserGroupControllerTest.php 6 additions, 0 deletions

...ion/modules/admin/controllers/UserGroupControllerTest.php

with 115 additions and 45 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