Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorKamil TrzciƄski (OoO till 16th of April) <ayufan@ayufan.eu>2018-04-18 11:45:38 +0300
committerFilipa Lacerda <filipa@gitlab.com>2018-04-18 12:09:46 +0300
commit3dac487a62fed910559baedf5ea1a7c43f79554a (patch)
tree06d3d5291456e3fb6398165c1d4f0db27ac4cfa0 /app
parent28891da395ecca9be0984180fe4c691c7854bfd1 (diff)
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
Diffstat (limited to 'app')
-rw-r--r--app/services/ci/register_job_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/ci/register_job_service.rb b/app/services/ci/register_job_service.rb
index e09b445636f..113dcdd7201 100644
--- a/app/services/ci/register_job_service.rb
+++ b/app/services/ci/register_job_service.rb
@@ -30,7 +30,7 @@ module Ci
end
end
- builds.find do |build|
+ builds.auto_include(false).find do |build|
next unless runner.can_pick?(build)
begin