Merge branch '45473-temporary-fix-for-ci-register-jobs-service' into 'master'

Resolve "Using goldiloader results in Ci::RegisterJobService#execute spending a lot of time eager loading a lot of associations" See merge request gitlab-org/gitlab-ce!18439

Merge branch '45473-temporary-fix-for-ci-register-jobs-service' into 'master'
4e64c9f4 · Kamil Trzciński (OoO till 16th of April) · 5db76a3b · cca5797f · 4e64c9f4
Commit 4e64c9f4 authored Apr 18, 2018 by Kamil Trzciński (OoO till 16th of April)
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

register_job_service.rb app/services/ci/register_job_service.rb +1 -1

No files found.
--- a/app/services/ci/register_job_service.rb
+++ b/app/services/ci/register_job_service.rb
@@ -33,7 +33,7 @@ module Ci
        end
      end

-      builds.find do |build|
+      builds.auto_include(false).find do |build|
        next unless runner.can_pick?(build)

        begin