summaryrefslogtreecommitdiff
path: root/app/models/milestone.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/models/milestone.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/models/milestone.rb')
-rw-r--r--app/models/milestone.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index d979a35084b..84acba30b6b 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -16,7 +16,9 @@
class Milestone < ActiveRecord::Base
# Represents a "No Milestone" state used for filtering Issues and Merge
# Requests that have no milestone assigned.
- None = Struct.new(:title).new('No Milestone')
+ MilestoneStruct = Struct.new(:title, :name)
+ None = MilestoneStruct.new('No Milestone', 'No Milestone')
+ Any = MilestoneStruct.new('Any', '')
include InternalId
include Sortable
@@ -47,6 +49,8 @@ class Milestone < ActiveRecord::Base
state :active
end
+ alias_attribute :name, :title
+
class << self
def search(query)
query = "%#{query}%"