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

Commit b34bfc2b authored 5 years ago by

Patrick Barroca

Downloads
- Plain Diff

Merge branch 'hotline' into 'master'

Hotline

See merge request !3289

parents 4b715a9d 88d8d852

Branches

Tags

2 merge requests!3297WIP: Master,!3289Hotline

Pipeline #8578 passed with stage

in 42 minutes and 29 seconds

Changes 8
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_HOTLINE/98477 1 addition, 0 deletions

VERSIONS_HOTLINE/98477
VERSIONS_HOTLINE/99328 1 addition, 0 deletions

VERSIONS_HOTLINE/99328
library/Class/Systeme/Sql.php 5 additions, 0 deletions

library/Class/Systeme/Sql.php
library/Class/WebService/SIGB/Nanook/PatronInfoReader.php 3 additions, 0 deletions

library/Class/WebService/SIGB/Nanook/PatronInfoReader.php
library/ZendAfi/Controller/Action/Helper/ListViewMode/Abstract.php 6 additions, 1 deletion

...endAfi/Controller/Action/Helper/ListViewMode/Abstract.php
library/ZendAfi/Controller/Action/Helper/ListViewMode/Sitotheque.php 1 addition, 1 deletion

...dAfi/Controller/Action/Helper/ListViewMode/Sitotheque.php
tests/fixtures/NanookFixtures.php 14 additions, 0 deletions

tests/fixtures/NanookFixtures.php
tests/scenarios/Security/SitoControllerTest.php 45 additions, 0 deletions

tests/scenarios/Security/SitoControllerTest.php

with 76 additions and 2 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