Commit 3df1a733 authored by Yorick Peterse's avatar Yorick Peterse

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
parents aeb3df17 afe40d5d
...@@ -11,7 +11,7 @@ module Projects ...@@ -11,7 +11,7 @@ module Projects
order: { due_date: :asc, title: :asc } 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]) MilestonesFinder.new(finder_params).execute.select([:iid, :title])
end end
......
---
title: Rails5 fix passing Group objects array into for_projects_and_groups milestone
scope
merge_request: 19920
author: Jasper Maes
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment