Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-06-28 23:12:32 +0300
committerRobert Speicher <rspeicher@gmail.com>2015-07-07 05:39:55 +0300
commitd00cb00d6b62c561da79b3fc0eab579364b3e91c (patch)
tree7aad204d8f21889c7b9befc078050019521dae1f /app/models
parentcfd813402deb631bdc4db9af68c6366ff1179f4a (diff)
Rename NoMilestone to Milestone::None
Also refactors IssuableFinder to avoid redundant title check.
Diffstat (limited to 'app/models')
-rw-r--r--app/models/milestone.rb4
-rw-r--r--app/models/no_milestone.rb13
2 files changed, 4 insertions, 13 deletions
diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index e0c5fec97b7..d28f3c8d3f9 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -14,6 +14,10 @@
#
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')
+
include InternalId
include Sortable
diff --git a/app/models/no_milestone.rb b/app/models/no_milestone.rb
deleted file mode 100644
index 0c7418b5e29..00000000000
--- a/app/models/no_milestone.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# NoMilestone
-#
-# Represents a "No Milestone" state used for filtering Issues and Merge Requests
-# that have no milestone assigned.
-class NoMilestone
- def self.id
- nil
- end
-
- def self.title
- 'No Milestone'
- end
-end