diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-09-15 14:19:53 +0300 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-09-15 14:19:53 +0300 |
commit | 50076ab974348e74514bb4f19169351f08e11636 (patch) | |
tree | f3ba725e2170e58513995fe941fef30ac13afb45 /lib/ci | |
parent | 11f87700e8bceeec96440809682406ae24334ed8 (diff) | |
parent | 4768521a6e9d6d8b9a57398ebb5d03aed5b5ac77 (diff) |
Merge remote-tracking branch 'origin/master' into per-build-token
# Conflicts:
# db/schema.rb
Diffstat (limited to 'lib/ci')
-rw-r--r-- | lib/ci/api/builds.rb | 2 | ||||
-rw-r--r-- | lib/ci/api/helpers.rb | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/ci/api/builds.rb b/lib/ci/api/builds.rb index 54db63d4628..59f85416ee5 100644 --- a/lib/ci/api/builds.rb +++ b/lib/ci/api/builds.rb @@ -27,7 +27,7 @@ module Ci else Gitlab::Metrics.add_event(:build_not_found) - not_found! + build_not_found! end end diff --git a/lib/ci/api/helpers.rb b/lib/ci/api/helpers.rb index 411e0dea15e..3dfebc0cac1 100644 --- a/lib/ci/api/helpers.rb +++ b/lib/ci/api/helpers.rb @@ -40,6 +40,14 @@ module Ci end end + def build_not_found! + if headers['User-Agent'].match(/gitlab-ci-multi-runner \d+\.\d+\.\d+(~beta\.\d+\.g[0-9a-f]+)? /) + no_content! + else + not_found! + end + end + def current_runner @runner ||= Runner.find_by_token(params[:token].to_s) end |