diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-02 09:10:47 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-02 09:10:47 +0300 |
commit | 03a521732276f8abc4ba069dd985b22cd9bc5929 (patch) | |
tree | ff12cf13ce5b76fcd6795652c1a169ee374f1463 /app/models/iteration.rb | |
parent | e28b754d23440d2c433f880d296926363441bd78 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/iteration.rb')
-rw-r--r-- | app/models/iteration.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/iteration.rb b/app/models/iteration.rb index 3495f099064..c39743a021f 100644 --- a/app/models/iteration.rb +++ b/app/models/iteration.rb @@ -36,8 +36,8 @@ class Iteration < ApplicationRecord .where('due_date is NULL or due_date >= ?', start_date) end - scope :start_date_passed, -> { where('start_date <= ?', Date.current).where('due_date > ?', Date.current) } - scope :due_date_passed, -> { where('due_date <= ?', Date.current) } + scope :start_date_passed, -> { where('start_date <= ?', Date.current).where('due_date >= ?', Date.current) } + scope :due_date_passed, -> { where('due_date < ?', Date.current) } state_machine :state_enum, initial: :upcoming do event :start do |