Add latest changes from gitlab-org/gitlab@master

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