summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/javascripts/users_select.js.coffee1
-rw-r--r--lib/api/users.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/users_select.js.coffee b/app/assets/javascripts/users_select.js.coffee
index 7a39e4256e2..f8049384364 100644
--- a/app/assets/javascripts/users_select.js.coffee
+++ b/app/assets/javascripts/users_select.js.coffee
@@ -24,6 +24,7 @@ $ ->
data: (term, page) ->
search: term # search term
per_page: 10
+ active: true
private_token: gon.api_token
results: (data, page) -> # parse the results into the format expected by Select2.
diff --git a/lib/api/users.rb b/lib/api/users.rb
index 567750dfa45..125a8624021 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -10,6 +10,7 @@ module Gitlab
# GET /users
get do
@users = User.scoped
+ @users = @users.active if params[:active].present?
@users = @users.search(params[:search]) if params[:search].present?
present @users, with: Entities::User
end