diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-06-01 12:43:43 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-06-01 12:43:43 +0000 |
| commit | afb2d667cae42b77e090b4b240848c4d4ddcaf2d (patch) | |
| tree | 6cb66332f5ec2889bbc4e3dbd870a6b65fbe8aa1 /app/services | |
| parent | 709e8b263863c5a92959700b67462c2ebe4f1831 (diff) | |
| parent | 5c6c184f70719c464690455abc02e777b3ba4b7b (diff) | |
| download | gitlab-ce-afb2d667cae42b77e090b4b240848c4d4ddcaf2d.tar.gz | |
Merge branch '46010-add-more-validations-for-runners-and-runner-type' into 'master'
Improve validations for Ci::Runner#runner_type
See merge request gitlab-org/gitlab-ce!18901
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 4291631913a..317d1defbba 100644 --- a/app/services/ci/register_job_service.rb +++ b/app/services/ci/register_job_service.rb @@ -89,7 +89,10 @@ module Ci end def builds_for_group_runner - hierarchy_groups = Gitlab::GroupHierarchy.new(runner.groups).base_and_descendants + # Workaround for weird Rails bug, that makes `runner.groups.to_sql` to return `runner_id = NULL` + groups = Group.joins(:runner_namespaces).merge(runner.runner_namespaces) + + hierarchy_groups = Gitlab::GroupHierarchy.new(groups).base_and_descendants projects = Project.where(namespace_id: hierarchy_groups) .with_group_runners_enabled .with_builds_enabled |