diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-02 14:10:43 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-02 14:10:43 +0100 |
| commit | f385988d1648e54218d68e02a25eaad048b04d0b (patch) | |
| tree | 8ffe49e24eec194fc80df2e90a3ae3baf2758422 /app | |
| parent | a895d5d3b2252cd962b8ea19d2c1092cbee7fca6 (diff) | |
| download | gitlab-ce-f385988d1648e54218d68e02a25eaad048b04d0b.tar.gz | |
Use "Any Label" and "Any Milestone" in selects rather than the ambiguous "Any" option
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/label.rb | 2 | ||||
| -rw-r--r-- | app/models/milestone.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/models/label.rb b/app/models/label.rb index b306aecbac1..bef6063fe88 100644 --- a/app/models/label.rb +++ b/app/models/label.rb @@ -17,7 +17,7 @@ class Label < ActiveRecord::Base # Requests that have no label assigned. LabelStruct = Struct.new(:title, :name) None = LabelStruct.new('No Label', 'No Label') - Any = LabelStruct.new('Any', '') + Any = LabelStruct.new('Any Label', '') DEFAULT_COLOR = '#428BCA' diff --git a/app/models/milestone.rb b/app/models/milestone.rb index c2642b75b8a..d8c7536cd31 100644 --- a/app/models/milestone.rb +++ b/app/models/milestone.rb @@ -16,9 +16,9 @@ class Milestone < ActiveRecord::Base # Represents a "No Milestone" state used for filtering Issues and Merge # Requests that have no milestone assigned. - MilestoneStruct = Struct.new(:title, :name) - None = MilestoneStruct.new('No Milestone', 'No Milestone') - Any = MilestoneStruct.new('Any', '') + MilestoneStruct = Struct.new(:title, :name, :id) + None = MilestoneStruct.new('No Milestone', 'No Milestone', 0) + Any = MilestoneStruct.new('Any Milestone', '', -1) include InternalId include Sortable |