summaryrefslogtreecommitdiff
path: root/app/services/ci
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2015-09-28 14:44:07 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2015-09-29 10:47:03 +0200
commit2c1f7ccac8180a49e45fb3cf79e03318420d1037 (patch)
treeeedcef2c050b56bb7e4f123b3b201d8993d81868 /app/services/ci
parent6abca1284791475a8240e4b25b5e6e7175533101 (diff)
downloadgitlab-ce-2c1f7ccac8180a49e45fb3cf79e03318420d1037.tar.gz
Fix register_build_service tests
Diffstat (limited to 'app/services/ci')
-rw-r--r--app/services/ci/register_build_service.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/services/ci/register_build_service.rb b/app/services/ci/register_build_service.rb
index 33f1c1e918d..78cc51d31bb 100644
--- a/app/services/ci/register_build_service.rb
+++ b/app/services/ci/register_build_service.rb
@@ -8,10 +8,10 @@ module Ci
builds =
if current_runner.shared?
# don't run projects which have not enables shared runners
- builds.includes(:project).where(ci_projects: { shared_runners_enabled: true })
+ builds.joins(commit: {gl_project: :gitlab_ci_project}).where(ci_projects: {shared_runners_enabled: true})
else
# do run projects which are only assigned to this runner
- builds.where(project_id: current_runner.projects)
+ builds.joins(:commit).where(ci_commits: {gl_project_id: current_runner.gl_projects_ids})
end
builds = builds.order('created_at ASC')
@@ -19,7 +19,7 @@ module Ci
build = builds.find do |build|
(build.tag_list - current_runner.tag_list).empty?
end
-
+
if build
# In case when 2 runners try to assign the same build, second runner will be declined