Commit 165833d3 authored by Jarka Kadlecová's avatar Jarka Kadlecová

Resolve conflicts in api/users

parent 7c088f2f
......@@ -75,12 +75,9 @@ module API
use :sort_params
use :pagination
use :with_custom_attributes
<<<<<<< HEAD
# EE
optional :skip_ldap, type: Boolean, default: false, desc: 'Skip LDAP users'
=======
>>>>>>> upstream/master
end
get do
authenticated_as_admin! if params[:external].present? || (params[:extern_uid].present? && params[:provider].present?)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment