kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Yorick Peterse 2018-06-18 12:43:29 +00:00
parent aeb3df1727 afe40d5d7f
commit 3df1a7336d
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/projects/autocomplete_service.rb
View File

@ -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

6
changelogs/unreleased/rails5-fix-48012.yml Normal file
View File

@ -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