diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-05 06:25:55 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-05 06:25:55 +0000 |
| commit | fb3f95bcaf78955c17f35b59755a69ca89386c88 (patch) | |
| tree | 9542ede92175d5492c5d12d8011855f65f174894 /app/services | |
| parent | 6bc89c0e3baf064425a47401ba97d27d8e943a59 (diff) | |
| parent | 6426b507244b7f1cec4a7308ab29978d20c8ec98 (diff) | |
| download | gitlab-ce-fb3f95bcaf78955c17f35b59755a69ca89386c88.tar.gz | |
Merge branch '36862-subgroup-milestones' into 'master'
Include all ancestors milestones in json list & autocomplete
Closes #36862
See merge request gitlab-org/gitlab-ce!19317
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/projects/autocomplete_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/projects/autocomplete_service.rb b/app/services/projects/autocomplete_service.rb index 346971138b1..3e38a8a12d4 100644 --- a/app/services/projects/autocomplete_service.rb +++ b/app/services/projects/autocomplete_service.rb @@ -11,7 +11,7 @@ module Projects order: { due_date: :asc, title: :asc } } - finder_params[:group_ids] = [@project.group.id] if @project.group + finder_params[:group_ids] = @project.group.self_and_ancestors.select(:id) if @project.group MilestonesFinder.new(finder_params).execute.select([:iid, :title]) end |