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

Commit 69373104 authored 9 years ago by

Laurent

Downloads
- Plain Diff

Merge branch...

Merge branch 'hotline#30552_le_pseudo_d_un_utilisateur_abonne_sigb_ne_resiste_pas_a_la_mise_a_jour' into 'stable'

Hotline#30552 le pseudo d un utilisateur abonne sigb ne resiste pas a la mise a jour

See merge request !1189

parents ed24f061 22cdb614

Branches

Tags

2 merge requests!1192Master,!1191Hotline master

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_HOTLINE/30552 3 additions, 0 deletions

VERSIONS_HOTLINE/30552
application/modules/admin/controllers/UsersController.php 1 addition, 2 deletions

application/modules/admin/controllers/UsersController.php
application/modules/admin/views/scripts/users/_form.phtml 21 additions, 10 deletions

application/modules/admin/views/scripts/users/_form.phtml
cosmogramme/php/_init.php 1 addition, 1 deletion

cosmogramme/php/_init.php
cosmogramme/sql/patch/patch_267.php 1 addition, 2 deletions

cosmogramme/sql/patch/patch_267.php
cosmogramme/sql/patch/patch_268.php 4 additions, 0 deletions

cosmogramme/sql/patch/patch_268.php
tests/application/modules/admin/controllers/UsersControllerTest.php 33 additions, 4 deletions

...ication/modules/admin/controllers/UsersControllerTest.php
tests/db/UpgradeDBTest.php 27 additions, 0 deletions

tests/db/UpgradeDBTest.php

with 91 additions and 19 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