Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/concerns/milestoneable.rb')
-rw-r--r--app/models/concerns/milestoneable.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/concerns/milestoneable.rb b/app/models/concerns/milestoneable.rb
index e95a8a42aa6..b72d99d211c 100644
--- a/app/models/concerns/milestoneable.rb
+++ b/app/models/concerns/milestoneable.rb
@@ -52,7 +52,9 @@ module Milestoneable
def milestone_available?
return true if milestone_id.blank?
- project_id == milestone&.project_id || project.ancestors_upto.compact.include?(milestone&.group)
+ (project_id.present? && project_id == milestone&.project_id) ||
+ try(:namespace)&.self_and_ancestors&.include?(milestone&.group) ||
+ project&.ancestors_upto&.compact&.include?(milestone&.group)
end
##