diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-14 15:09:25 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-14 15:09:25 +0300 |
| commit | 7f408a3831590a1f98a1e1a04b63acba8937e36b (patch) | |
| tree | 7d2dcf5e93e93b8573dcc39b9630f8705de2e83f /app/models/concerns/milestoneable.rb | |
| parent | 4ab67d65296979ba6f5fca3142b86460b748590e (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, 1 insertions, 3 deletions
diff --git a/app/models/concerns/milestoneable.rb b/app/models/concerns/milestoneable.rb index d42417bb6c1..ccb334343ff 100644 --- a/app/models/concerns/milestoneable.rb +++ b/app/models/concerns/milestoneable.rb @@ -39,13 +39,11 @@ module Milestoneable private def milestone_is_valid - errors.add(:milestone_id, 'is invalid') if respond_to?(:milestone_id) && !milestone_available? + errors.add(:milestone_id, 'is invalid') if respond_to?(:milestone_id) && milestone_id.present? && !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 |