summaryrefslogtreecommitdiff
path: root/app/services/releases/base_service.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-19 00:08:50 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-19 00:08:50 +0000
commit0171a97525d8578d4f5b5a36f337b1ab947ea317 (patch)
tree23509c42c3e2404c055899e1c02568008c1ac6d3 /app/services/releases/base_service.rb
parentd345547329af023668dcdc691f2a2ae0dffa2626 (diff)
downloadgitlab-ce-0171a97525d8578d4f5b5a36f337b1ab947ea317.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/releases/base_service.rb')
-rw-r--r--app/services/releases/base_service.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/services/releases/base_service.rb b/app/services/releases/base_service.rb
index 11004dd2e9f..15d040287a3 100644
--- a/app/services/releases/base_service.rb
+++ b/app/services/releases/base_service.rb
@@ -63,6 +63,7 @@ module Releases
project: project,
current_user: current_user,
project_ids: Array(project.id),
+ group_ids: Array(project_group_id),
state: 'all',
title: params[:milestones]
).execute
@@ -79,5 +80,10 @@ module Releases
def param_for_milestone_titles_provided?
params.key?(:milestones)
end
+
+ # overridden in EE
+ def project_group_id; end
end
end
+
+Releases::BaseService.prepend_if_ee('EE::Releases::BaseService')