Merge branch 'master-v5' into instance/fid (1b8c4d3c) · Commits · ubl / finc / vufind · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

vufind
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- 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.

ubl
finc
vufind
Commits
1b8c4d3c

Commit 1b8c4d3c authored 5 years ago by

Dorian Merz

Downloads
- Plain Diff

Merge branch 'master-v5' into instance/fid

parents e4250ab7 19e821d4

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 1 deletion

.gitignore
devops/composer/modules.php 3 additions, 1 deletion

devops/composer/modules.php
devops/docker/autoconfig/entrypoint.sh 2 additions, 1 deletion

devops/docker/autoconfig/entrypoint.sh
devops/docker/composer/entrypoint.sh 3 additions, 2 deletions

devops/docker/composer/entrypoint.sh
devops/docker/env/entrypoint.sh 8 additions, 5 deletions

devops/docker/env/entrypoint.sh
devops/docker/grunt/entrypoint.sh 1 addition, 1 deletion

devops/docker/grunt/entrypoint.sh
devops/docker/mail/entrypoint.sh 1 addition, 1 deletion

devops/docker/mail/entrypoint.sh
devops/docker/php/Dockerfile 4 additions, 2 deletions

devops/docker/php/Dockerfile
docker-compose.yml 1 addition, 4 deletions

docker-compose.yml
docker-env.0.finc.yml 19 additions, 8 deletions

docker-env.0.finc.yml

with 43 additions and 26 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