diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-24 12:07:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-24 12:07:44 +0300 |
| commit | 6593f1f627938f22090dec5221476772d3ed581d (patch) | |
| tree | ac5b9adf00f24f1d7cbc59c7d78f7c4fd06a0001 /app/services/quick_actions | |
| parent | 2f369bd95866b7f623387ce2b6acf646df3d5222 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/quick_actions')
| -rw-r--r-- | app/services/quick_actions/interpret_service.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/quick_actions/interpret_service.rb b/app/services/quick_actions/interpret_service.rb index a14e0515a1f..a781eacc40e 100644 --- a/app/services/quick_actions/interpret_service.rb +++ b/app/services/quick_actions/interpret_service.rb @@ -84,7 +84,9 @@ module QuickActions # rubocop: enable CodeReuse/ActiveRecord def find_milestones(project, params = {}) - MilestonesFinder.new(params.merge(project_ids: [project.id], group_ids: [project.group&.id])).execute + group_ids = project.group.self_and_ancestors.select(:id) if project.group + + MilestonesFinder.new(params.merge(project_ids: [project.id], group_ids: group_ids)).execute end def parent |