diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-16 11:43:58 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-16 11:43:58 +0000 |
| commit | 6dfd88a145b7c7f9dc798d888a2aa4ad5c1c54b7 (patch) | |
| tree | 386a7e8e5d9638a811e0473d644e4e0c01af3410 /app/controllers/groups_controller.rb | |
| parent | 8fa47d005852732adcf75dd06d2ab420520f1e34 (diff) | |
| parent | 85cecc0b2ef25ef4e4dc56583b0e202400168abb (diff) | |
| download | gitlab-ce-6dfd88a145b7c7f9dc798d888a2aa4ad5c1c54b7.tar.gz | |
Merge branch 'fix-group-members-search' into 'master'
Fix group members search
Postgres only.
500 error when try to search group members on `/groups/:group_id/members` page
Diffstat (limited to 'app/controllers/groups_controller.rb')
| -rw-r--r-- | app/controllers/groups_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index a3019b3ac78..ddaae6f0e8c 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -68,7 +68,7 @@ class GroupsController < ApplicationController @members = group.users_groups if params[:search].present? - users = group.users.search(params[:search]) + users = group.users.search(params[:search]).to_a @members = @members.where(user_id: users) end |