summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-06-01 11:18:18 -0700
committerStan Hu <stanhu@gmail.com>2018-06-01 11:18:18 -0700
commitc9cf677e20737aa9f8a824ec2e51b4ed12bc8ea4 (patch)
tree160061f6163724e820b0d41cf64619e2e64b5ad4
parente1ffd6a271e352a725aa0394b654e9250f2d8240 (diff)
downloadgitlab-ce-c9cf677e20737aa9f8a824ec2e51b4ed12bc8ea4.tar.gz
Remove ambiguity in Group class causing build failures
https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/71887977 was failing due to confusion between Ci::Group and Group. https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/71887977
-rw-r--r--app/services/ci/register_job_service.rb2
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 317d1defbba..925775aea0b 100644
--- a/app/services/ci/register_job_service.rb
+++ b/app/services/ci/register_job_service.rb
@@ -90,7 +90,7 @@ module Ci
def builds_for_group_runner
# 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)
+ 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)