Merge remote-tracking branch 'origin/stable' into hotline-master (6a8dedfa) · 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
6a8dedfa

Commit 6a8dedfa authored 10 years ago by

Alex Arnaud

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/stable' into hotline-master

Conflicts:
	VERSIONS
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_231.php
	library/startup.php

parents e9513267 fc50df8f

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS 4 additions, 0 deletions

VERSIONS
cosmogramme/php/_init.php 1 addition, 1 deletion

cosmogramme/php/_init.php
cosmogramme/sql/patch/patch_234.php 18 additions, 0 deletions

cosmogramme/sql/patch/patch_234.php
library/Class/Migration/PatchHash.php 26 additions, 0 deletions

library/Class/Migration/PatchHash.php
library/Class/Migration/Patchs.php 121 additions, 51 deletions

library/Class/Migration/Patchs.php
library/Class/Testing/FileSystem.php 1 addition, 1 deletion

library/Class/Testing/FileSystem.php
library/startup.php 1 addition, 1 deletion

library/startup.php
tests/application/modules/opac/controllers/MigrateControllerTest.php 7 additions, 1 deletion

...cation/modules/opac/controllers/MigrateControllerTest.php
tests/library/Class/MigrationFixture.php 38 additions, 6 deletions

tests/library/Class/MigrationFixture.php
tests/library/Class/MigrationTest.php 25 additions, 9 deletions

tests/library/Class/MigrationTest.php

with 242 additions and 70 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