diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-13 12:11:10 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-13 12:11:10 +0300 |
| commit | 37974ac0b196b06ffcc6cbea44385eaac1cc57bd (patch) | |
| tree | 98450a46516f93a71018ec6b8d718fc023744575 /app/models/concerns/milestoneable.rb | |
| parent | fcbd3db20f5dfb13ae33ddfee98be8d92cade72f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns/milestoneable.rb')
| -rw-r--r-- | app/models/concerns/milestoneable.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/concerns/milestoneable.rb b/app/models/concerns/milestoneable.rb index ccb334343ff..d42417bb6c1 100644 --- a/app/models/concerns/milestoneable.rb +++ b/app/models/concerns/milestoneable.rb @@ -39,11 +39,13 @@ module Milestoneable private def milestone_is_valid - errors.add(:milestone_id, 'is invalid') if respond_to?(:milestone_id) && milestone_id.present? && !milestone_available? + errors.add(:milestone_id, 'is invalid') if respond_to?(:milestone_id) && !milestone_available? end end def milestone_available? + return true if milestone_id.blank? + project_id == milestone&.project_id || project.ancestors_upto.compact.include?(milestone&.group) end |