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

Commit 7fe23967 authored 5 years ago by

Patrick Barroca

Downloads
- Plain Diff

Merge branch 'hotline' into 'master'

Hotline

See merge request !3460

parents aab535be 7819d3ec

Branches

Tags

2 merge requests!3461Master,!3460Hotline

Pipeline #9794 passed with stage

Stage:

in 43 minutes and 12 seconds

Changes 8
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS 6 additions, 0 deletions

VERSIONS
library/Class/DigitalResource.php 8 additions, 7 deletions

library/Class/DigitalResource.php
library/Class/Permission.php 5 additions, 0 deletions

library/Class/Permission.php
library/Class/UserGroup.php 7 additions, 0 deletions

library/Class/UserGroup.php
library/Class/UserGroup/Permission.php 5 additions, 5 deletions

library/Class/UserGroup/Permission.php
library/Class/Users.php 9 additions, 0 deletions

library/Class/Users.php
library/digital_resources/ToutApprendre/tests/ToutApprendreTest.php 65 additions, 1 deletion

...gital_resources/ToutApprendre/tests/ToutApprendreTest.php
library/startup.php 1 addition, 1 deletion

library/startup.php

with 106 additions and 14 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