diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 30c510f1807da28a412e283488e002f11b32b428..a6685c2fa1586a63fe162b0515e10bfe67b7695e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ image: docker:19.03.12 variables: DOCKER_TLS_CERTDIR: "/certs" - IMAGE_VER: 1.10.0 + IMAGE_VER: 1.10.1 services: - docker:19.03.12-dind diff --git a/lib/CF/Controller/SSO.pm b/lib/CF/Controller/SSO.pm index f93a1207cc5ea876830fbbabc34755a609d88bcd..7aae982db98160eeef30f3d2ebf2d2aeeb27dd36 100644 --- a/lib/CF/Controller/SSO.pm +++ b/lib/CF/Controller/SSO.pm @@ -96,7 +96,8 @@ sub _users ($c, $search) { USER: foreach my $user ( sort { - $b->{priority} <=> $a->{priority} or + $b->{included} <=> $a->{included} or + $b->{priority} <=> $a->{priority} or lc($a->{firstname}) cmp lc($b->{firstname}) or lc($a->{lastname}) cmp lc($b->{lastname}) } @tmp ) {