Merge branch 'hotline#48476_bug_sur_les_roles_utilisateurs' into 'hotline-master' (5e76fcb3) · 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
5e76fcb3

Commit 5e76fcb3 authored 8 years ago by

Patrick Barroca

Downloads
- Plain Diff

Merge branch 'hotline#48476_bug_sur_les_roles_utilisateurs' into 'hotline-master'

hotline #48476 fix user search criteria conflict with model attributes

See merge request !1833

parents 975a4981 43d9bed1

Branches

Tags

2 merge requests!1837Master,!1836Hotline master

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_HOTLINE/48476 1 addition, 0 deletions

VERSIONS_HOTLINE/48476
library/Class/User/SearchCriteria.php 11 additions, 7 deletions

library/Class/User/SearchCriteria.php
library/Class/User/SearchCriteria/Abstract.php 5 additions, 4 deletions

library/Class/User/SearchCriteria/Abstract.php
library/Class/User/SearchCriteria/NewsletterSubscriptionStatus.php 1 addition, 1 deletion

...lass/User/SearchCriteria/NewsletterSubscriptionStatus.php
library/Class/User/SearchCriteria/WithMail.php 1 addition, 1 deletion

library/Class/User/SearchCriteria/WithMail.php
tests/application/modules/admin/controllers/NewsletterControllerTest.php 13 additions, 14 deletions

...on/modules/admin/controllers/NewsletterControllerTest.php
tests/application/modules/admin/controllers/UsersControllerTest.php 21 additions, 20 deletions

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

with 53 additions and 47 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