diff options
| author | Dennis Tang <dtang@gitlab.com> | 2018-06-21 08:48:25 +0000 |
|---|---|---|
| committer | Dennis Tang <dtang@gitlab.com> | 2018-06-21 08:48:25 +0000 |
| commit | 0e7f8fd5bd7ed184b8a12039739200065ffa2dbd (patch) | |
| tree | 07b3c3bbcc0d05848ab7034d2ed32a801f8786b9 /scripts | |
| parent | 203d1026008effeeba5c1f98dba768448473f9fe (diff) | |
| parent | 904cbe0132a1caf0dbb7efb8bdc70398d1d82289 (diff) | |
| download | gitlab-ce-0e7f8fd5bd7ed184b8a12039739200065ffa2dbd.tar.gz | |
Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabs
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/trigger-build | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/trigger-build b/scripts/trigger-build index 526f5164ede..798bf1e82b7 100755 --- a/scripts/trigger-build +++ b/scripts/trigger-build @@ -165,6 +165,10 @@ module Trigger end JSON.parse(res.body)['status'].to_s.to_sym + rescue JSON::ParserError + # Ignore GitLab API hiccups. If GitLab is really down, we'll hit the job + # timeout anyway. + :running end end end |