diff options
| author | Grzegorz Bizon <grzegorz.bizon@ntsn.pl> | 2016-02-01 13:46:02 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-02-19 17:24:59 +0100 |
| commit | f3e92fb4d04f69deddcf1daf3dde8a79cf942bd5 (patch) | |
| tree | c905f61fd3e46a41e3e847eec5d97c1bd57f829c /app/models/ci | |
| parent | c8102d938bf8f1c73058281b2724730c6d88a53b (diff) | |
| download | gitlab-ce-f3e92fb4d04f69deddcf1daf3dde8a79cf942bd5.tar.gz | |
Make CI build eraseable only if build is completed
Diffstat (limited to 'app/models/ci')
| -rw-r--r-- | app/models/ci/build.rb | 4 | ||||
| -rw-r--r-- | app/models/ci/build/eraseable.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index ff100a31e7c..33bc4128312 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -205,6 +205,10 @@ module Ci end end + def trace_empty? + raw_trace.blank? + end + def raw_trace if File.file?(path_to_trace) File.read(path_to_trace) diff --git a/app/models/ci/build/eraseable.rb b/app/models/ci/build/eraseable.rb index df686852f7d..96cbbbe5fda 100644 --- a/app/models/ci/build/eraseable.rb +++ b/app/models/ci/build/eraseable.rb @@ -11,7 +11,7 @@ module Ci end def eraseable? - artifacts_file.exists? || File.file?(path_to_trace) + complete? && (artifacts_file.exists? || !trace_empty?) end def erase_url |