diff options
| author | Kamil Trzciński (OoO till 16th of April) <ayufan@ayufan.eu> | 2018-04-18 08:45:38 +0000 |
|---|---|---|
| committer | Kamil Trzciński (OoO till 16th of April) <ayufan@ayufan.eu> | 2018-04-18 08:45:38 +0000 |
| commit | 4e64c9f4a2ddbee218fe1b3142e8d605c5e2966b (patch) | |
| tree | bc7c67a71247bc66076c9419610f34fe99fbbf9f | |
| parent | 5db76a3b2e31adda34c912ddafbdac043725cb4a (diff) | |
| parent | cca5797f05e5611a66c19f94a24a4ce6d2ed9859 (diff) | |
| download | gitlab-ce-4e64c9f4a2ddbee218fe1b3142e8d605c5e2966b.tar.gz | |
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
| -rw-r--r-- | app/services/ci/register_job_service.rb | 2 |
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 b07b2fcba75..79eec33ae73 100644 --- 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 |