summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Derichs <pderichs@gitlab.com>2019-04-18 10:33:05 +0200
committerPatrick Derichs <pderichs@gitlab.com>2019-04-18 10:33:05 +0200
commit07cea951d255878257586a011fc25c372b9d691c (patch)
tree3b8873af8e903a3da1433fd802b336b2bed294d9
parent613ce6446e76bc0544c8abe8611c3963871726b0 (diff)
downloadgitlab-ce-ce-issue-10671.tar.gz
Aligned changes to Issuable with EEce-issue-10671
-rw-r--r--app/models/concerns/issuable.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 3232c51bfbd..775aaa44e5b 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -128,10 +128,6 @@ module Issuable
assignees.count > 1
end
- def milestone_available?
- project_id == milestone&.project_id || project.ancestors_upto.compact.include?(milestone&.group)
- end
-
private
def milestone_is_valid
@@ -277,6 +273,10 @@ module Issuable
end
end
+ def milestone_available?
+ project_id == milestone&.project_id || project.ancestors_upto.compact.include?(milestone&.group)
+ end
+
def assignee_or_author?(user)
author_id == user.id || assignees.exists?(user.id)
end