Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 9 deletions

diff --git a/app/services/ci/queue/build_queue_service.rb b/app/services/ci/queue/build_queue_service.rb
index 2deebc1d725..d6a252df82f 100644
--- a/app/services/ci/queue/build_queue_service.rb
+++ b/app/services/ci/queue/build_queue_service.rb
@@ -34,10 +34,6 @@ module Ci
         order(relation)
       end
 
-      def builds_queued_before(relation, time)
-        relation.queued_before(time)
-      end
-
       def builds_for_protected_runner(relation)
         relation.ref_protected
       end
diff --git a/app/services/ci/register_job_service.rb b/app/services/ci/register_job_service.rb
index e5b0683d601..68ebb376ccd 100644
--- a/app/services/ci/register_job_service.rb
+++ b/app/services/ci/register_job_service.rb
@@ -129,11 +129,6 @@ module Ci
         builds = queue.builds_with_any_tags(builds)
       end
 
-      # pick builds that older than specified age
-      if params.key?(:job_age) && Feature.disabled?(:remove_job_age_from_jobs_api)
-        builds = queue.builds_queued_before(builds, params[:job_age].seconds.ago)
-      end
-
       build_ids = retrieve_queue(-> { queue.execute(builds) })
 
       @metrics.observe_queue_size(-> { build_ids.size }, @runner.runner_type)