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

There was a problem fetching the pipeline stages.

Commit bca81963 authored 7 years ago by

Patrick Barroca

Downloads
- Plain Diff

Merge branch 'master' into 'WIP'

Master

See merge request !2415

parents e834fd41 56987b83

Pipeline #2960 passed with stage

in 21 minutes and 56 seconds

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS 9 additions, 0 deletions

VERSIONS
library/Class/FileManager.php 0 additions, 10 deletions

library/Class/FileManager.php
library/Class/Multimedia/Device.php 2 additions, 2 deletions

library/Class/Multimedia/Device.php
library/ZendAfi/View/Helper/TagTimeline.php 9 additions, 8 deletions

library/ZendAfi/View/Helper/TagTimeline.php
library/digital_resources/Omeka/Config.php 1 addition, 1 deletion

library/digital_resources/Omeka/Config.php
library/digital_resources/Omeka/tests/OmekaTest.php 7 additions, 0 deletions

library/digital_resources/Omeka/tests/OmekaTest.php
library/startup.php 1 addition, 1 deletion

library/startup.php
tests/application/modules/push/controllers/MultimediaControllerTest.php 1 addition, 1 deletion

...ion/modules/push/controllers/MultimediaControllerTest.php
tests/library/Class/FileManagerTest.php 0 additions, 105 deletions

tests/library/Class/FileManagerTest.php

with 30 additions and 128 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