diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-19 18:07:14 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-19 18:07:14 +0200 |
| commit | 3b42c267a6299b7aeed8c3309dae49b5b7b3f9e0 (patch) | |
| tree | 1e3e5a91027595aab9dd47def6444ad1f46d4d5f | |
| parent | 07a88d66993da87c3f3b6f1108403f8671c19f1d (diff) | |
| download | gitlab-ce-3b42c267a6299b7aeed8c3309dae49b5b7b3f9e0.tar.gz | |
Dont show blocked users in autocomplete
| -rw-r--r-- | app/assets/javascripts/users_select.js.coffee | 1 | ||||
| -rw-r--r-- | lib/api/users.rb | 1 |
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 |