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

There was a problem fetching the pipeline stages.

Commit cb62f8ff authored 7 years ago by

Patrick Barroca

Downloads
- Plain Diff

Merge branch 'hotline-master' into 'master'

Hotline master

See merge request !2150

parents 890dbc9e a509fae8

Branches

Tags

3 merge requests!2334Master,!2151Master,!2150Hotline master

Pipeline #1478 passed with stage

in 10 minutes and 29 seconds

Changes 8
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS 7 additions, 0 deletions

VERSIONS
application/modules/admin/controllers/CmsController.php 3 additions, 4 deletions

application/modules/admin/controllers/CmsController.php
library/Class/User/DoubleFinder.php 1 addition, 1 deletion

library/Class/User/DoubleFinder.php
library/ZendAfi/Controller/Action/Helper/ArticleListViewMode.php 7 additions, 6 deletions

.../ZendAfi/Controller/Action/Helper/ArticleListViewMode.php
library/startup.php 1 addition, 1 deletion

library/startup.php
tests/application/modules/admin/controllers/CmsControllerListModeTest.php 4 additions, 4 deletions

...n/modules/admin/controllers/CmsControllerListModeTest.php
tests/library/Class/UserDoubleFinderTest.php 1 addition, 1 deletion

tests/library/Class/UserDoubleFinderTest.php
tests/library/ZendAfi/Controller/Action/Helper/ArticleListViewModeTest.php 1 addition, 1 deletion

...dAfi/Controller/Action/Helper/ArticleListViewModeTest.php

with 25 additions and 18 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