dev #64203 add merge users function (936cb960) · 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
936cb960

There was a problem fetching the pipeline stages.

Commit 936cb960 authored 7 years ago by

Ghislain Loas

Downloads
- Patches
- Plain Diff

dev #64203 add merge users function

parent edfce400

Branches

Tags

Pipeline #2369 failed with stage

in 20 minutes and 10 seconds

Changes 4
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

application/modules/admin/controllers/UsersController.php 22 additions, 0 deletions

application/modules/admin/controllers/UsersController.php
application/modules/admin/views/scripts/users/manage-double-user.phtml 48 additions, 13 deletions

...odules/admin/views/scripts/users/manage-double-user.phtml
library/Class/User/DbDoubleFinder.php 28 additions, 7 deletions

library/Class/User/DbDoubleFinder.php
tests/application/modules/admin/controllers/UsersControllerTest.php 72 additions, 2 deletions

...ication/modules/admin/controllers/UsersControllerTest.php

with 170 additions and 22 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