summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2016-11-22 12:59:32 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2016-11-22 12:59:32 +0000
commit30c122e224a1889d1749b8ace67e3f54d6373b02 (patch)
treeb6ccc5e9980614b9e2474217669ec4e8df9a834c /app/models
parentc111ba6a76ff72f1563e912f82832e6f969d0ef6 (diff)
parent7ec8cc121a9db954a3a0b5c8ebfc05cb471823db (diff)
downloadgitlab-ce-30c122e224a1889d1749b8ace67e3f54d6373b02.tar.gz
Merge branch 'fix-failed-email-for-external-jobs' into 'master'
External jobs do not have show page nor traces Fixes #24677 See merge request !7617
Diffstat (limited to 'app/models')
-rw-r--r--app/models/commit_status.rb10
1 files changed, 7 insertions, 3 deletions
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index d159fc6c5c7..c345bf293c9 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -135,15 +135,19 @@ class CommitStatus < ActiveRecord::Base
allow_failure? && (failed? || canceled?)
end
+ def duration
+ calculate_duration
+ end
+
def playable?
false
end
- def duration
- calculate_duration
+ def stuck?
+ false
end
- def stuck?
+ def has_trace?
false
end
end