summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2016-04-13 13:24:44 +0000
committerJacob Schatz <jschatz1@gmail.com>2016-04-13 13:24:44 +0000
commitf026e53c4df5b0b3bb7435c05d3c8662afe45881 (patch)
tree14221dac3a8d8ba973d0970059dc8de930b1d51c /app/assets
parentc74604699269a2edbbe937309cce7a4ed789cb07 (diff)
parenta6ba94dbd109637b996246601f1bc2b62dc0a8d7 (diff)
downloadgitlab-ce-f026e53c4df5b0b3bb7435c05d3c8662afe45881.tar.gz
Merge branch 'label-filter' into 'master'
Fixed not being able to filter by any or no labels Brings back the options to filter by any or no label Closes #15008 ![Screen_Shot_2016-04-07_at_11.26.41](/uploads/20d949b19f537d830118532e1d44feb7/Screen_Shot_2016-04-07_at_11.26.41.png) See merge request !3589
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/labels_select.js.coffee2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee
index d1fe116397a..90385621879 100644
--- a/app/assets/javascripts/labels_select.js.coffee
+++ b/app/assets/javascripts/labels_select.js.coffee
@@ -218,7 +218,7 @@ class @LabelsSelect
selectable: true
toggleLabel: (selected) ->
- if selected and selected.title isnt 'Any Label'
+ if selected and selected.title?
selected.title
else
defaultLabel