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

There was a problem fetching the pipeline stages.

Commit ef48cd13 authored 7 years ago by

Patrick Barroca

Downloads
- Plain Diff

Merge branch 'master' into 'WIP'

Master

See merge request !2189

parents 8885db50 4f67e92e

1 merge request!2189Master

Pipeline #1706 passed with stage

in 11 minutes and 15 seconds

Changes 6
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS 7 additions, 0 deletions

VERSIONS
application/modules/admin/controllers/WidgetController.php 1 addition, 1 deletion

application/modules/admin/controllers/WidgetController.php
application/modules/api/controllers/UserController.php 1 addition, 0 deletions

application/modules/api/controllers/UserController.php
library/startup.php 1 addition, 1 deletion

library/startup.php
tests/scenarios/MobileApplication/UserAccountTest.php 6 additions, 0 deletions

tests/scenarios/MobileApplication/UserAccountTest.php
tests/scenarios/Widgets/WidgetsTest.php 22 additions, 1 deletion

tests/scenarios/Widgets/WidgetsTest.php

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