Merge remote-tracking branch 'refs/remotes/origin/hotline-master' (6e937f46) · 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
6e937f46

There was a problem fetching the pipeline stages.

Commit 6e937f46 authored 7 years ago by

Ghislain Loas

Downloads
- Plain Diff

Merge remote-tracking branch 'refs/remotes/origin/hotline-master'

Conflicts:
	library/Class/Url.php

parents a0a0bbd7 94a02b84

Branches

Tags

1 merge request!2334Master

Pipeline #1281 passed with stage

in 20 minutes and 6 seconds

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_HOTLINE/56180 1 addition, 0 deletions

VERSIONS_HOTLINE/56180
VERSIONS_HOTLINE/59488 1 addition, 0 deletions

VERSIONS_HOTLINE/59488
library/Class/Url.php 18 additions, 4 deletions

library/Class/Url.php
library/Class/User/DoubleFinder.php 74 additions, 8 deletions

library/Class/User/DoubleFinder.php
library/ZendAfi/View/Helper/TagDilicomWidget.php 24 additions, 16 deletions

library/ZendAfi/View/Helper/TagDilicomWidget.php
tests/library/Class/UserDoubleFinderTest.php 126 additions, 0 deletions

tests/library/Class/UserDoubleFinderTest.php
tests/library/ZendAfi/View/Helper/RenderAlbumTest.php 29 additions, 10 deletions

tests/library/ZendAfi/View/Helper/RenderAlbumTest.php

with 273 additions and 38 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