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:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-08-28 00:10:27 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-08-28 00:10:27 +0300
commit29471900730296fbd71ba8a24d3d5bc810cd2529 (patch)
tree7ba4881377bb7fe98901c2e27bf275ba1ad79b9b /app/models/concerns/milestoneable.rb
parentda50206243972a4cafcaea7539aed7c6986c775e (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns/milestoneable.rb')
-rw-r--r--app/models/concerns/milestoneable.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/milestoneable.rb b/app/models/concerns/milestoneable.rb
index ccb334343ff..b1698bc2ee3 100644
--- a/app/models/concerns/milestoneable.rb
+++ b/app/models/concerns/milestoneable.rb
@@ -51,7 +51,7 @@ module Milestoneable
# Overridden on EE module
#
def supports_milestone?
- respond_to?(:milestone_id)
+ respond_to?(:milestone_id) && !incident?
end
end