diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-08-21 22:22:18 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-08-21 22:22:18 +0000 |
| commit | fe77eb4df112409ef1f951afebef1d45927cd8e4 (patch) | |
| tree | 70731620f0c849366cc8ad91b22809d449b7b190 /changelogs | |
| parent | def895c5490389c0c27fe90a407d576c73a295c4 (diff) | |
| parent | 4dd883ee9a2d85a89d475125550a78882de57514 (diff) | |
| download | gitlab-ce-fe77eb4df112409ef1f951afebef1d45927cd8e4.tar.gz | |
Merge branch 'dz-fix-sql-error-admin-users-2fa' into 'master'
Fix SQL error when sorting 2FA-enabled users by name in admin area
See merge request gitlab-org/gitlab-ce!21324
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/dz-fix-sql-error-admin-users-2fa.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/dz-fix-sql-error-admin-users-2fa.yml b/changelogs/unreleased/dz-fix-sql-error-admin-users-2fa.yml new file mode 100644 index 00000000000..67926f3738a --- /dev/null +++ b/changelogs/unreleased/dz-fix-sql-error-admin-users-2fa.yml @@ -0,0 +1,5 @@ +--- +title: Fix SQL error when sorting 2FA-enabled users by name in admin area +merge_request: 21324 +author: +type: fixed |