Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 2 deletions

diff --git a/app/models/projects/build_artifacts_size_refresh.rb b/app/models/projects/build_artifacts_size_refresh.rb
index 959f486a50a..f411dbe88ed 100644
--- a/app/models/projects/build_artifacts_size_refresh.rb
+++ b/app/models/projects/build_artifacts_size_refresh.rb
@@ -83,9 +83,14 @@ module Projects
 
     def next_batch(limit:)
       project.job_artifacts.select(:id, :size)
-        .where('created_at <= ? AND id > ?', refresh_started_at, last_job_artifact_id.to_i)
-        .order(:created_at)
+        .created_at_before(refresh_started_at)
+        .id_after(last_job_artifact_id.to_i)
+        .ordered_by_created_at_and_id_asc
         .limit(limit)
     end
+
+    def started?
+      !created?
+    end
   end
 end