summaryrefslogtreecommitdiff
path: root/lib/api/users.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-03-13 21:37:50 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-03-13 23:19:09 +0200
commitbf17d976a7be3404e30a0211c4c9b5ef78bf5104 (patch)
treebab44ff553e83e359b0ebf9c3cf74fbe66479075 /lib/api/users.rb
parent163908b393bf69e4accbe22cbba1df50fa491649 (diff)
downloadgitlab-ce-bf17d976a7be3404e30a0211c4c9b5ef78bf5104.tar.gz
add api users filter and integrate users select2
Diffstat (limited to 'lib/api/users.rb')
-rw-r--r--lib/api/users.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb
index 6cc3a7e52c9..1462e7b4c1d 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -9,7 +9,8 @@ module Gitlab
# Example Request:
# GET /users
get do
- @users = paginate User
+ @users = User.scoped
+ @users = @users.search(params[:search]) if params[:search].present?
present @users, with: Entities::User
end