diff options
author | Valery Sizov <valery@gitlab.com> | 2016-11-30 14:53:30 +0200 |
---|---|---|
committer | Valery Sizov <valery@gitlab.com> | 2016-11-30 14:53:30 +0200 |
commit | 32c6c9c457d88071ad82728ea6111a2d7d31b634 (patch) | |
tree | fe7f181e05f7268d5cdb177b05d763f5c22c3634 /app/models/milestone.rb | |
parent | 7a155137a4fd965cb8ff512a9548a7e685b330f5 (diff) | |
parent | 43c8788e7bd4c705bc8215ea2409b21a19d090f7 (diff) | |
download | gitlab-ce-32c6c9c457d88071ad82728ea6111a2d7d31b634.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2
Diffstat (limited to 'app/models/milestone.rb')
-rw-r--r-- | app/models/milestone.rb | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/app/models/milestone.rb b/app/models/milestone.rb index 23aecbfa3a6..c774e69080c 100644 --- a/app/models/milestone.rb +++ b/app/models/milestone.rb @@ -29,6 +29,7 @@ class Milestone < ActiveRecord::Base validates :title, presence: true, uniqueness: { scope: :project_id } validates :project, presence: true + validate :start_date_should_be_less_than_due_date, if: Proc.new { |m| m.start_date.present? && m.due_date.present? } strip_attributes :title @@ -131,24 +132,6 @@ class Milestone < ActiveRecord::Base self.title end - def expired? - if due_date - due_date.past? - else - false - end - end - - def expires_at - if due_date - if due_date.past? - "expired on #{due_date.to_s(:medium)}" - else - "expires on #{due_date.to_s(:medium)}" - end - end - end - def can_be_closed? active? && issues.opened.count.zero? end @@ -212,4 +195,10 @@ class Milestone < ActiveRecord::Base def sanitize_title(value) CGI.unescape_html(Sanitize.clean(value.to_s)) end + + def start_date_should_be_less_than_due_date + if due_date <= start_date + errors.add(:start_date, "Can't be greater than due date") + end + end end |