Merge remote-tracking branch 'refs/remotes/origin/stable' (10a1db04) · 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
10a1db04

There was a problem fetching the latest pipeline status.

Commit 10a1db04 authored 8 years ago by

Ghislain Loas

Downloads
- Plain Diff

Merge remote-tracking branch 'refs/remotes/origin/stable'

parents b0a37cc6 371b4498

Branches

Tags

1 merge request!2334Master

Pipeline #1118 failed with stage

in 11 minutes and 42 seconds

Changes 6
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_HOTLINE/59056 1 addition, 0 deletions

VERSIONS_HOTLINE/59056
application/modules/admin/controllers/UsersController.php 4 additions, 1 deletion

application/modules/admin/controllers/UsersController.php
library/Class/User/SearchCriteria.php 9 additions, 6 deletions

library/Class/User/SearchCriteria.php
library/Class/User/SearchCriteria/RoleLevelLimit.php 32 additions, 0 deletions

library/Class/User/SearchCriteria/RoleLevelLimit.php
library/ZendAfi/Controller/Plugin/Manager/User.php 5 additions, 2 deletions

library/ZendAfi/Controller/Plugin/Manager/User.php
tests/application/modules/admin/controllers/UsersControllerTest.php 52 additions, 3 deletions

...ication/modules/admin/controllers/UsersControllerTest.php

with 103 additions and 12 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