diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-19 03:08:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-19 03:08:50 +0300 |
commit | 0171a97525d8578d4f5b5a36f337b1ab947ea317 (patch) | |
tree | 23509c42c3e2404c055899e1c02568008c1ac6d3 /app/models/milestone_release.rb | |
parent | d345547329af023668dcdc691f2a2ae0dffa2626 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/milestone_release.rb')
-rw-r--r-- | app/models/milestone_release.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/milestone_release.rb b/app/models/milestone_release.rb index 0a6165c8254..2f2bf91e436 100644 --- a/app/models/milestone_release.rb +++ b/app/models/milestone_release.rb @@ -11,6 +11,10 @@ class MilestoneRelease < ApplicationRecord def same_project_between_milestone_and_release return if milestone&.project_id == release&.project_id + return if milestone&.group_id + errors.add(:base, _('Release does not have the same project as the milestone')) end end + +MilestoneRelease.prepend_if_ee('EE::MilestoneRelease') |