summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2016-03-18 10:46:56 +0000
committerRémy Coutable <remy@rymai.me>2016-03-18 21:19:35 +0100
commit56949f5e6971ab451d7826ef6c9d3894d93af046 (patch)
tree385c4c712954c81abb0a7bdc1b33f3b56b2a87bb
parent915edceef4ee5136a065e4bfcb283ad1ae5ee5b7 (diff)
downloadgitlab-ce-56949f5e6971ab451d7826ef6c9d3894d93af046.tar.gz
Merge branch 'fix-any-milestone-value' into 'master'
Fixes issue with any milestone value in dropdown not being selectable Closes #14293 See merge request !3234
-rw-r--r--app/assets/javascripts/milestone_select.js.coffee3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/milestone_select.js.coffee b/app/assets/javascripts/milestone_select.js.coffee
index 134045b013a..e17a1adb648 100644
--- a/app/assets/javascripts/milestone_select.js.coffee
+++ b/app/assets/javascripts/milestone_select.js.coffee
@@ -23,6 +23,7 @@ class @MilestoneSelect
if showAny
data.unshift(
+ isAny: true
title: 'Any Milestone'
)
@@ -44,7 +45,7 @@ class @MilestoneSelect
milestone.title
id: (milestone) ->
if !useId
- if milestone.title isnt "Any milestone"
+ if !milestone.isAny?
milestone.title
else
''