diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-08-01 16:59:57 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-08-01 16:59:57 +0900 |
| commit | 87b41f49d89c2143aae92a3445453d88fc777f9d (patch) | |
| tree | 48a25ce36a69ab73517258a58338c1722846cb04 | |
| parent | 3fcbfabb091619b2199c7391efa202f418294efc (diff) | |
| download | gitlab-ce-feature/sm/33281-protected-runner-executes-jobs-on-protected-branch-s2.tar.gz | |
Add select_builds_by_ref_statusfeature/sm/33281-protected-runner-executes-jobs-on-protected-branch-s2
| -rw-r--r-- | app/services/ci/register_job_service.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/services/ci/register_job_service.rb b/app/services/ci/register_job_service.rb index b951e8d0c9f..917d998dfb6 100644 --- a/app/services/ci/register_job_service.rb +++ b/app/services/ci/register_job_service.rb @@ -20,6 +20,8 @@ module Ci builds_for_specific_runner end + builds = select_builds_by_ref_status(builds) + valid = true builds.find do |build| @@ -81,5 +83,13 @@ module Ci def shared_runner_build_limits_feature_enabled? ENV['DISABLE_SHARED_RUNNER_BUILD_MINUTES_LIMIT'].to_s != 'true' end + + def select_builds_by_ref_status(builds) + if runner.protected? + builds.select { |build| build.project.protected_for?(build.ref) } + else + builds + end + end end end |