diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-12 18:06:26 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-12 18:06:26 +0300 |
| commit | 69944ffb68788d190e81ff7e33db5dcb6c903184 (patch) | |
| tree | 4112a1285f186c140749e8410a8a2788b6812500 /app/services/ci | |
| parent | 1b7381e998ff4b33ec8f633766030082e95f10c8 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/ci')
| -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 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 |