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

There was a problem fetching the pipeline stages.

Commit 1433778a authored 6 years ago by

Patrick Barroca

Downloads
- Plain Diff

Merge branch 'hotline' into 'master'

Hotline

See merge request !2585

parents c8ad2be2 f91a2300

Branches

Tags

3 merge requests!2660Master,!2586Master,!2585Hotline

Pipeline #3831 passed with stage

in 34 minutes and 5 seconds

Changes 8
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_HOTLINE/72999 2 additions, 0 deletions

VERSIONS_HOTLINE/72999
application/modules/api/controllers/ErrorController.php 31 additions, 0 deletions

application/modules/api/controllers/ErrorController.php
application/modules/api/controllers/UserController.php 32 additions, 10 deletions

application/modules/api/controllers/UserController.php
application/modules/api/views/scripts/invalid_request.pjson 0 additions, 4 deletions

application/modules/api/views/scripts/invalid_request.pjson
library/ZendAfi/View/Helper/Accueil/Library.php 2 additions, 1 deletion

library/ZendAfi/View/Helper/Accueil/Library.php
public/opac/js/renderFilters/ajaxifyFilters.js 5 additions, 3 deletions

public/opac/js/renderFilters/ajaxifyFilters.js
tests/library/ZendAfi/View/Helper/Accueil/LibraryTest.php 34 additions, 9 deletions

tests/library/ZendAfi/View/Helper/Accueil/LibraryTest.php
tests/scenarios/MobileApplication/UserAccountTest.php 38 additions, 7 deletions

tests/scenarios/MobileApplication/UserAccountTest.php

with 144 additions and 34 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