diff options
| author | Alexis Reigel <mail@koffeinfrei.org> | 2017-09-25 16:46:03 +0200 |
|---|---|---|
| committer | Alexis Reigel <alexis.reigel.ext@siemens.com> | 2018-04-23 09:21:44 +0200 |
| commit | 81c0c57acd0f065bc5b80902ee664256d4c3241f (patch) | |
| tree | 57787040e98a46400ab2b13a7fb8203e21557a4b /app/models/ci/runner.rb | |
| parent | 677291b6a7fea19f5b35638918b3cd0008dc8d15 (diff) | |
| download | gitlab-ce-81c0c57acd0f065bc5b80902ee664256d4c3241f.tar.gz | |
exclude group runners on projects that disabled it
Diffstat (limited to 'app/models/ci/runner.rb')
| -rw-r--r-- | app/models/ci/runner.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb index 6ffa9372c6e..2f4342b79aa 100644 --- a/app/models/ci/runner.rb +++ b/app/models/ci/runner.rb @@ -35,13 +35,16 @@ module Ci %{ INNER JOIN ci_runner_groups ON ci_runner_groups.runner_id = ci_runners.id INNER JOIN namespaces ON namespaces.id = ci_runner_groups.group_id - INNER JOIN projects group_projects ON group_projects.namespace_id = namespaces.id + INNER JOIN projects ON projects.namespace_id = namespaces.id } ).where( %{ - group_projects.id = :project_id + projects.id = :project_id + AND + projects.group_runners_enabled = :true }, - project_id: project_id + project_id: project_id, + true: true ) shared_runners = where(is_shared: true) |