diff --git a/app/assets/javascripts/users_select.js.coffee b/app/assets/javascripts/users_select.js.coffee index 7a39e4256e241d1464363f5800a67de641d18bbe..f804938436471e8e4dc72c0cd3ec15b9c9b1a470 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 567750dfa459bb6563ea753ebc655bac6be36566..125a8624021b83af0abb0b9f5090ff5ee1f0342a 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