Merge remote-tracking branch 'refs/remotes/origin/hotline-master' into origin-master (584dd3b4) · 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
584dd3b4

There was a problem fetching the pipeline stages.

Commit 584dd3b4 authored 8 years ago by

Ghislain Loas

Downloads
- Plain Diff

Merge remote-tracking branch 'refs/remotes/origin/hotline-master' into origin-master

parents f1283626 269d22d6

Branches

Tags

2 merge requests!2080Sandbox detach zf from storm,!2061Master

Pipeline #394 failed with stage

in 12 minutes and 56 seconds

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_HOTLINE/53821 1 addition, 0 deletions

VERSIONS_HOTLINE/53821
application/modules/opac/controllers/RechercheController.php 33 additions, 15 deletions

application/modules/opac/controllers/RechercheController.php
tests/application/modules/opac/controllers/RechercheControllerPrintActionTest.php 3 additions, 1 deletion

...s/opac/controllers/RechercheControllerPrintActionTest.php
tests/application/modules/opac/controllers/RechercheControllerTest.php 9 additions, 2 deletions

...tion/modules/opac/controllers/RechercheControllerTest.php
tests/application/modules/telephone/controllers/RechercheControllerTest.php 10 additions, 7 deletions

...modules/telephone/controllers/RechercheControllerTest.php

with 56 additions and 25 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