diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-07 06:09:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-07 06:09:46 +0300 |
| commit | 2e26679b96b5621de70b00bc44f0d3893f1954df (patch) | |
| tree | 463eefd402f73e8f03dfade7aeb20e56b5d83892 /app/models/milestone.rb | |
| parent | d4f8f25db649b973f1ae344cb0f8a407862d106b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/milestone.rb')
| -rw-r--r-- | app/models/milestone.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/models/milestone.rb b/app/models/milestone.rb index b1cac9af30f..da6490611fd 100644 --- a/app/models/milestone.rb +++ b/app/models/milestone.rb @@ -19,6 +19,12 @@ class Milestone < ApplicationRecord has_many :events, as: :target, dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent scope :started, -> { active.where('milestones.start_date <= CURRENT_DATE') } + scope :not_started, -> { active.where('milestones.start_date > CURRENT_DATE') } + scope :not_upcoming, -> do + active + .where('milestones.due_date <= CURRENT_DATE') + .order(:project_id, :group_id, :due_date) + end scope :order_by_name_asc, -> { order(Arel::Nodes::Ascending.new(arel_table[:title].lower)) } scope :reorder_by_due_date_asc, -> { reorder(Gitlab::Database.nulls_last_order('due_date', 'ASC')) } |