diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-16 15:08:32 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-16 15:08:32 +0300 |
| commit | c158fa8d69c704663d289341a014c44c062cda88 (patch) | |
| tree | d0cac82a9ac9e9ad28bb0030266eb8d5dc91fbbc /app/controllers/groups/milestones_controller.rb | |
| parent | b806264d29b8d52ccb78a41dcc3d67f2b040700c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/groups/milestones_controller.rb')
| -rw-r--r-- | app/controllers/groups/milestones_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb index 1e9d51cf970..7eba73daa3c 100644 --- a/app/controllers/groups/milestones_controller.rb +++ b/app/controllers/groups/milestones_controller.rb @@ -119,7 +119,9 @@ class Groups::MilestonesController < Groups::ApplicationController end def search_params - params.permit(:state, :search_title).merge(group_ids: group.id) + groups = request.format.json? ? group.self_and_ancestors.select(:id) : group.id + + params.permit(:state, :search_title).merge(group_ids: groups) end end |