summaryrefslogtreecommitdiff
path: root/app/helpers/labels_helper.rb
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-10-08 21:24:55 -0700
committerStan Hu <stanhu@gmail.com>2015-10-08 23:53:32 -0700
commitb60bc655f2e1318f448f3a3d884437677c1135b7 (patch)
tree5bc98fe85bb39f89c444d2dec221ba06ada1cd1d /app/helpers/labels_helper.rb
parent680b6d88a5c0d63deeb2909f1c83e3630db87780 (diff)
downloadgitlab-ce-b60bc655f2e1318f448f3a3d884437677c1135b7.tar.gz
Restore placeholders in issue filters from "Any" to "Milestone" and "Label"
1f11096c included new filters but made it hard to determine which dropdown did what. This patch restores the original placeholders.
Diffstat (limited to 'app/helpers/labels_helper.rb')
-rw-r--r--app/helpers/labels_helper.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index 662ace367b9..66b18eea699 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -95,7 +95,8 @@ module LabelsHelper
def project_labels_options(project)
labels = project.labels.to_a
labels.unshift(Label::None)
- options_from_collection_for_select(labels, 'name', 'name', params[:label_name])
+ labels.unshift(Label::Any)
+ options_from_collection_for_select(labels, 'name', 'title', params[:label_name])
end
# Required for Gitlab::Markdown::LabelReferenceFilter