diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2015-10-14 21:57:05 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2015-10-14 21:57:05 +0300 |
| commit | a3a80eac110fb9f195eaccd3afd8e8611d1924dc (patch) | |
| tree | 6a9611c35c23e7ffeeff52185c40c5f1007fb94e /app/services | |
| parent | 45c0b74dc4e099216025433e66478e1e79e017e1 (diff) | |
| parent | d9e2232f6393a1627847c9f6c2be3c4f987d0797 (diff) | |
Merge branch 'show_pending_warning' into 'master'
Show warning when build is pending and there are not runners
This change is based on: !1530.
This resolves #2967.
See merge request !1573
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/ci/register_build_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/ci/register_build_service.rb b/app/services/ci/register_build_service.rb index 71b61bbe389..7beb098659c 100644 --- a/app/services/ci/register_build_service.rb +++ b/app/services/ci/register_build_service.rb @@ -17,7 +17,7 @@ module Ci builds = builds.order('created_at ASC') build = builds.find do |build| - (build.tag_list - current_runner.tag_list).empty? + build.can_be_served?(current_runner) end |