diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-01-26 21:33:27 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-01-30 17:33:48 +0200 |
| commit | d6febcaf3e210447f243923dfdb90beb0671f96f (patch) | |
| tree | d679366e2348485cd0d4b045d802a7721cb82216 | |
| parent | 15ad1d881582cc20145f5d0be69de84606576260 (diff) | |
| download | gitlab-ce-d6febcaf3e210447f243923dfdb90beb0671f96f.tar.gz | |
Include nested groups items into search results
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/services/search/global_service.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/services/search/global_service.rb b/app/services/search/global_service.rb index aa9837038a6..d477a5d3c7e 100644 --- a/app/services/search/global_service.rb +++ b/app/services/search/global_service.rb @@ -9,7 +9,11 @@ module Search def execute group = Group.find_by(id: params[:group_id]) if params[:group_id].present? projects = ProjectsFinder.new.execute(current_user) - projects = projects.in_namespace(group.id) if group + + if group + ids = group.descendants.push(group.id) + projects = projects.in_namespace(ids) + end Gitlab::SearchResults.new(current_user, projects, params[:search]) end |