summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2016-03-18 10:46:56 +0000
committerJacob Schatz <jschatz1@gmail.com>2016-03-18 10:46:56 +0000
commitad04a9118828ea072df46c06b599b75d1e22fd47 (patch)
treec2acce0fcfa784252c64a0d4aa7516b1efc1fa4a
parentfde975facc37c7d2f7ea5c997624bc7c0f5759a8 (diff)
parentfa6fae18a95656c0f300fff86214ad62626131b2 (diff)
downloadgitlab-ce-ad04a9118828ea072df46c06b599b75d1e22fd47.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 5e884454a65..32159a7c179 100644
--- a/app/assets/javascripts/milestone_select.js.coffee
+++ b/app/assets/javascripts/milestone_select.js.coffee
@@ -30,6 +30,7 @@ class @MilestoneSelect
if showAny
data.unshift(
+ isAny: true
title: 'Any Milestone'
)
@@ -46,7 +47,7 @@ class @MilestoneSelect
milestone.title
id: (milestone) ->
if !useId
- if milestone.title isnt "Any milestone"
+ if !milestone.isAny?
milestone.title
else
""