diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2018-06-15 13:22:24 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2018-06-15 13:22:24 +0000 |
| commit | 1ed954e8a7abd3a8bc1649d0deec6d1ee2149496 (patch) | |
| tree | 890962b29dd129a618d4f008d0d4d0b6d0bc8bd9 | |
| parent | 34421835173449fdb3169d744dd7f32f1186c8a9 (diff) | |
| parent | 3778a136e1c573443be3aabae30397262ec74460 (diff) | |
| download | gitlab-ce-1ed954e8a7abd3a8bc1649d0deec6d1ee2149496.tar.gz | |
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
| -rw-r--r-- | app/controllers/projects/milestones_controller.rb | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/rails5-fix-47836.yml | 6 | ||||
| -rw-r--r-- | lib/banzai/filter/milestone_reference_filter.rb | 2 |
3 files changed, 9 insertions, 3 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 diff --git a/changelogs/unreleased/rails5-fix-47836.yml b/changelogs/unreleased/rails5-fix-47836.yml new file mode 100644 index 00000000000..2aef2db607a --- /dev/null +++ b/changelogs/unreleased/rails5-fix-47836.yml @@ -0,0 +1,6 @@ +--- +title: Rails5 fix passing Group objects array into for_projects_and_groups milestone + scope +merge_request: 19863 +author: Jasper Maes +type: fixed diff --git a/lib/banzai/filter/milestone_reference_filter.rb b/lib/banzai/filter/milestone_reference_filter.rb index 858e790005c..af8448937b3 100644 --- a/lib/banzai/filter/milestone_reference_filter.rb +++ b/lib/banzai/filter/milestone_reference_filter.rb @@ -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) |