diff options
| author | Dylan Griffith <dyl.griffith@gmail.com> | 2018-05-03 14:37:01 +0200 |
|---|---|---|
| committer | Dylan Griffith <dyl.griffith@gmail.com> | 2018-05-03 14:37:19 +0200 |
| commit | af15b6f0e144762a38591c53b970e312c35fe65f (patch) | |
| tree | 3f391685ba936e084dad816b78f1c82c7fc0d41a /app/services | |
| parent | bf790c26c58e214c27132e7a54fdf4a4cc77bdaf (diff) | |
| download | gitlab-ce-af15b6f0e144762a38591c53b970e312c35fe65f.tar.gz | |
Fix Project#group_runners_enabled as it was doing nothing
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/ci/register_job_service.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/services/ci/register_job_service.rb b/app/services/ci/register_job_service.rb index 8f8a5fbb2b0..a7d8ad93f38 100644 --- a/app/services/ci/register_job_service.rb +++ b/app/services/ci/register_job_service.rb @@ -91,7 +91,10 @@ module Ci def builds_for_group_runner hierarchy_groups = Gitlab::GroupHierarchy.new(runner.groups).base_and_descendants projects = Project.where(namespace_id: hierarchy_groups) - new_builds.where(project: projects.without_deleted.with_builds_enabled).order('created_at ASC') + .with_group_runners_enabled + .with_builds_enabled + .without_deleted + new_builds.where(project: projects).order('created_at ASC') end def running_builds_for_shared_runners |