diff options
| author | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-03-11 17:46:14 +0000 |
|---|---|---|
| committer | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-03-12 18:08:01 +0000 |
| commit | 7530827ecae0596616623d1c4f7775b08d5ada3c (patch) | |
| tree | 57e4e09d7aebc77d1e85173a648babeb0a79d910 /app/models/milestone.rb | |
| parent | b9d13c11dee8f555b0d80fd5b9b6a42be7721461 (diff) | |
| download | gitlab-ce-7530827ecae0596616623d1c4f7775b08d5ada3c.tar.gz | |
fixes issues for mr acceptance
Diffstat (limited to 'app/models/milestone.rb')
| -rw-r--r-- | app/models/milestone.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/models/milestone.rb b/app/models/milestone.rb index 85f7d8a7754..7697072d231 100644 --- a/app/models/milestone.rb +++ b/app/models/milestone.rb @@ -19,7 +19,7 @@ class Milestone < ActiveRecord::Base MilestoneStruct = Struct.new(:title, :name, :id) None = MilestoneStruct.new('No Milestone', 'No Milestone', 0) Any = MilestoneStruct.new('Any Milestone', '', -1) - Upcoming = MilestoneStruct.new('Upcoming', '', -2) + Upcoming = MilestoneStruct.new('Upcoming', '#upcoming', -2) include InternalId include Sortable @@ -82,6 +82,11 @@ class Milestone < ActiveRecord::Base super("milestones", /(?<milestone>\d+)/) end + def self.upcoming(projects) + self.where(project_id: projects) + .where('due_date > ?', Time.now). order(due_date: :asc).first + end + def to_reference(from_project = nil) escaped_title = self.title.gsub("]", "\\]") |