diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-08-31 21:38:02 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-09-01 01:20:24 +0800 |
| commit | 1bd2327c314ca8d5782298e80443c0fbbba0b66a (patch) | |
| tree | 71b5d99b59e9306c6be1f96dd817f915ee0b3d09 /app/models | |
| parent | 0997cfd750070f6fb4b821d5982594fc3ddb13e8 (diff) | |
| download | gitlab-ce-1bd2327c314ca8d5782298e80443c0fbbba0b66a.tar.gz | |
Add mock email templates
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/ci/build.rb | 7 | ||||
| -rw-r--r-- | app/models/service.rb | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 096b3b801af..755edadb7a4 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -133,8 +133,11 @@ module Ci end def trace_with_state(state = nil) - trace_with_state = Ci::Ansi2html::convert(trace, state) if trace.present? - trace_with_state || {} + if trace.present? + Ci::Ansi2html.convert(trace, state) + else + {} + end end def timeout diff --git a/app/models/service.rb b/app/models/service.rb index 09b4717a523..668c3fb69e3 100644 --- a/app/models/service.rb +++ b/app/models/service.rb @@ -198,6 +198,7 @@ class Service < ActiveRecord::Base bamboo buildkite builds_email + pipelines_email bugzilla campfire custom_issue_tracker |