diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-04-23 09:53:42 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-04-23 09:53:42 +0000 |
| commit | f81b1a24ede28ddcc95c25be113222f9e26e5a6d (patch) | |
| tree | b77b2ae5ca37054545db36a3b1c27c419f33d97b /lib/api/users.rb | |
| parent | 9b3085b4ef57612908f1089b553d6e34d7bf2ee9 (diff) | |
| parent | 04716cb0e7bb6708fd625f42a9ae802c510f1df5 (diff) | |
| download | gitlab-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 'lib/api/users.rb')
| -rw-r--r-- | lib/api/users.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb index 3920171205f..14b8a796c8e 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -77,7 +77,7 @@ module API authenticated_as_admin! if params[:external].present? || (params[:extern_uid].present? && params[:provider].present?) unless current_user&.admin? - params.except!(:created_after, :created_before, :order_by, :sort) + params.except!(:created_after, :created_before, :order_by, :sort, :two_factor) end users = UsersFinder.new(current_user, params).execute |