summaryrefslogtreecommitdiff
path: root/app/services/ci/register_job_service.rb
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-06-01 18:56:21 +0000
committerStan Hu <stanhu@gmail.com>2018-06-01 18:56:21 +0000
commit2de002b3db1bc199755f8be212fa8804fcb80905 (patch)
tree0c4460d62cd6a0b653b2d77e29447093ccb4933e /app/services/ci/register_job_service.rb
parent81e899ea7141b34a7860f308327249784fb5d6cc (diff)
parentc9cf677e20737aa9f8a824ec2e51b4ed12bc8ea4 (diff)
downloadgitlab-ce-2de002b3db1bc199755f8be212fa8804fcb80905.tar.gz
Merge branch 'fix-feature-memoization' into 'master'
Use RequestStore to memoize Flipper features so that memoized values are cleared between requests See merge request gitlab-org/gitlab-ce!19281
Diffstat (limited to 'app/services/ci/register_job_service.rb')
-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)