From 69944ffb68788d190e81ff7e33db5dcb6c903184 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 12 Nov 2019 15:06:26 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/services/ci/register_job_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/services/ci') diff --git a/app/services/ci/register_job_service.rb b/app/services/ci/register_job_service.rb index ff140444c1c..30e2a66e04a 100644 --- a/app/services/ci/register_job_service.rb +++ b/app/services/ci/register_job_service.rb @@ -149,7 +149,7 @@ module Ci # this returns builds that are ordered by number of running builds # we prefer projects that don't use shared runners at all joins("LEFT JOIN (#{running_builds_for_shared_runners.to_sql}) AS project_builds ON ci_builds.project_id=project_builds.project_id") - .order('COALESCE(project_builds.running_builds, 0) ASC', 'ci_builds.id ASC') + .order(Arel.sql('COALESCE(project_builds.running_builds, 0) ASC'), 'ci_builds.id ASC') end # rubocop: enable CodeReuse/ActiveRecord -- cgit v1.2.3