summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-04-23 09:53:42 +0000
committerDouwe Maan <douwe@gitlab.com>2018-04-23 09:53:42 +0000
commitf81b1a24ede28ddcc95c25be113222f9e26e5a6d (patch)
treeb77b2ae5ca37054545db36a3b1c27c419f33d97b /changelogs
parent9b3085b4ef57612908f1089b553d6e34d7bf2ee9 (diff)
parent04716cb0e7bb6708fd625f42a9ae802c510f1df5 (diff)
downloadgitlab-ce-f81b1a24ede28ddcc95c25be113222f9e26e5a6d.tar.gz
Merge branch 'dz-add-2fa-filter-admin-api' into 'master'
Add 2FA filter to users API for admins only See merge request gitlab-org/gitlab-ce!18503
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/dz-add-2fa-filter-admin-api.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/dz-add-2fa-filter-admin-api.yml b/changelogs/unreleased/dz-add-2fa-filter-admin-api.yml
new file mode 100644
index 00000000000..df479e69380
--- /dev/null
+++ b/changelogs/unreleased/dz-add-2fa-filter-admin-api.yml
@@ -0,0 +1,5 @@
+---
+title: Add 2FA filter to users API for admins only
+merge_request: 18503
+author:
+type: changed