diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-11-13 18:15:11 +0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-11-14 19:16:05 +0300 |
| commit | ba6a53f8f3be2d31de0449de23a4bb69f228ed62 (patch) | |
| tree | ac1d03f18d687696f41582f7ec7f2f315428cd26 /app | |
| parent | 19d6cdfe1b374fce6119a85a6e221d9e354dc0e3 (diff) | |
Merge branch 'fix-subgroup-autocomplete' into 'master'
Fix users autocomplete in a subgroup
Closes #39452
See merge request gitlab-org/gitlab-ce!15350
(cherry picked from commit 4a1e8188f96744103e51263c9bdc071c8e088690)
cf6ff601 Fix users autocomplete in a subgroup
Diffstat (limited to 'app')
| -rw-r--r-- | app/finders/autocomplete_users_finder.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/finders/autocomplete_users_finder.rb b/app/finders/autocomplete_users_finder.rb index b8f52e31926..c3f5358b577 100644 --- a/app/finders/autocomplete_users_finder.rb +++ b/app/finders/autocomplete_users_finder.rb @@ -45,7 +45,7 @@ class AutocompleteUsersFinder def find_users return users_from_project if project - return group.users if group + return group.users_with_parents if group return User.all if current_user User.none |