diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2018-06-18 12:43:29 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2018-06-18 12:43:29 +0000 |
| commit | 3df1a7336deb33c9ea0342957c64c7b7fd22956a (patch) | |
| tree | 69fe0cb814bbdd591ec2c5d3b19fdd0688c68599 | |
| parent | aeb3df17272cd1afec8297a0c7399c44aa8477d5 (diff) | |
| parent | afe40d5d7f1c3f2c6b01f308f5b5da65b2334734 (diff) | |
| download | gitlab-ce-3df1a7336deb33c9ea0342957c64c7b7fd22956a.tar.gz | |
Merge branch 'rails5-fix-48012' into 'master'
Rails5 fix passing Group objects array into for_projects_and_groups milestone scope
Closes #48012
See merge request gitlab-org/gitlab-ce!19920
| -rw-r--r-- | app/services/projects/autocomplete_service.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/rails5-fix-48012.yml | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/services/projects/autocomplete_service.rb b/app/services/projects/autocomplete_service.rb index 3e38a8a12d4..aa60661f7f2 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.self_and_ancestors.select(:id) if @project.group + finder_params[:group_ids] = @project.group.self_and_ancestors_ids if @project.group MilestonesFinder.new(finder_params).execute.select([:iid, :title]) end diff --git a/changelogs/unreleased/rails5-fix-48012.yml b/changelogs/unreleased/rails5-fix-48012.yml new file mode 100644 index 00000000000..953ccbd8af7 --- /dev/null +++ b/changelogs/unreleased/rails5-fix-48012.yml @@ -0,0 +1,6 @@ +--- +title: Rails5 fix passing Group objects array into for_projects_and_groups milestone + scope +merge_request: 19920 +author: Jasper Maes +type: fixed |