summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-11-22 13:36:19 +0800
committerLin Jen-Shin <godfat@godfat.org>2016-11-22 13:36:19 +0800
commitda9726170c377f2895992cd5c7b5e48eb351c045 (patch)
tree882851bf4ae5dd3d1de17390db48f2310cd9512c
parenta2fb636153669f06083903b473fbe8efc8fe3455 (diff)
downloadgitlab-ce-da9726170c377f2895992cd5c7b5e48eb351c045.tar.gz
Move has_trace? to CommitStatus than GenericCommitStatus
Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7617#note_18762721
-rw-r--r--app/models/commit_status.rb10
-rw-r--r--app/models/generic_commit_status.rb4
2 files changed, 7 insertions, 7 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
diff --git a/app/models/generic_commit_status.rb b/app/models/generic_commit_status.rb
index 6af8efab81b..fa54e3540d0 100644
--- a/app/models/generic_commit_status.rb
+++ b/app/models/generic_commit_status.rb
@@ -12,8 +12,4 @@ class GenericCommitStatus < CommitStatus
def tags
[:external]
end
-
- def has_trace?
- false
- end
end