Commit 1ed954e8 authored by Yorick Peterse's avatar Yorick Peterse

Merge branch 'rails5-fix-47836' into 'master'

Rails5 fix passing Group objects array into for_projects_and_groups milestone scope

Closes #47836

See merge request gitlab-org/gitlab-ce!19863
parents 34421835 3778a136
......@@ -123,9 +123,9 @@ class Projects::MilestonesController < Projects::ApplicationController
def search_params
if request.format.json? && @project.group && can?(current_user, :read_group, @project.group)
groups = @project.group.self_and_ancestors
groups = @project.group.self_and_ancestors_ids
end
params.permit(:state).merge(project_ids: @project.id, group_ids: groups&.select(:id))
params.permit(:state).merge(project_ids: @project.id, group_ids: groups)
end
end
---
title: Rails5 fix passing Group objects array into for_projects_and_groups milestone
scope
merge_request: 19863
author: Jasper Maes
type: fixed
......@@ -65,7 +65,7 @@ module Banzai
# We don't support IID lookups for group milestones, because IIDs can
# clash between group and project milestones.
if project.group && !params[:iid]
finder_params[:group_ids] = project.group.self_and_ancestors.select(:id)
finder_params[:group_ids] = project.group.self_and_ancestors_ids
end
MilestonesFinder.new(finder_params).find_by(params)
......
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