Merge branch... (f3690a7f) · 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
f3690a7f

Commit f3690a7f authored 5 years ago by

Patrick Barroca

Downloads
- Plain Diff

Merge branch...

Merge branch 'dev#88091_shooting_rajouter_les_ips_publiques_dans_shooting_pour_filtrage_acces_serveur_cache' into 'master'

dev #88091 : shooting : add public ip adress

See merge request !3093

parents 03cd5247 282243c3

Branches

Tags

3 merge requests!3297WIP: Master,!3106Master,!3093dev #88091 : shooting : add public ip adress

Pipeline #6792 passed with stage

Stage:

in 37 minutes and 12 seconds

Changes 8
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_WIP/88091 1 addition, 0 deletions

VERSIONS_WIP/88091
library/Class/Profil.php 7 additions, 1 deletion

library/Class/Profil.php
library/Class/Systeme/Report.php 27 additions, 2 deletions

library/Class/Systeme/Report.php
library/Class/Systeme/Report/Abstract.php 1 addition, 3 deletions

library/Class/Systeme/Report/Abstract.php
library/Trait/SimpleWebClient.php 36 additions, 0 deletions

library/Trait/SimpleWebClient.php
tests/library/ZendAfi/View/Helper/Status/HtmlTest.php 13 additions, 0 deletions

tests/library/ZendAfi/View/Helper/Status/HtmlTest.php
tests/library/ZendAfi/View/Helper/Status/JsonTest.php 14 additions, 0 deletions

tests/library/ZendAfi/View/Helper/Status/JsonTest.php
tests/library/ZendAfi/View/Helper/Status/TestCase.php 23 additions, 1 deletion

tests/library/ZendAfi/View/Helper/Status/TestCase.php

with 122 additions and 7 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