diff options
author | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-06-14 18:39:21 +0200 |
---|---|---|
committer | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-06-14 19:35:50 +0200 |
commit | 3778a136e1c573443be3aabae30397262ec74460 (patch) | |
tree | 4a7b69a3dde9a168821e980a670655b7bf340929 /app | |
parent | 4791f77100125e24094bda3828b8d2599d3d21e9 (diff) | |
download | gitlab-ce-3778a136e1c573443be3aabae30397262ec74460.tar.gz |
Rails5 fix passing Group objects array into for_projects_and_groups milestone scope
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/projects/milestones_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/milestones_controller.rb b/app/controllers/projects/milestones_controller.rb index 2494b56981d..f85dcfe6bfc 100644 --- a/app/controllers/projects/milestones_controller.rb +++ b/app/controllers/projects/milestones_controller.rb @@ -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 |