summaryrefslogtreecommitdiff
path: root/app/serializers/analytics_build_entity.rb
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-11-25 11:22:44 +0100
committerJames Lopez <james@jameslopez.es>2016-11-25 11:47:33 +0100
commit830f739b99b36f8862dadc524e4aa72ec5a3366e (patch)
tree744f10d8900493e2443b36d432cd6ed0f5e76f24 /app/serializers/analytics_build_entity.rb
parentaa895a64d928f8292ff9df526831ae74d250f748 (diff)
downloadgitlab-ce-830f739b99b36f8862dadc524e4aa72ec5a3366e.tar.gz
use an empty total time when the build has not started yet so the UI knows
Diffstat (limited to 'app/serializers/analytics_build_entity.rb')
-rw-r--r--app/serializers/analytics_build_entity.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/serializers/analytics_build_entity.rb b/app/serializers/analytics_build_entity.rb
index abefcd5cc02..206a7eadbcf 100644
--- a/app/serializers/analytics_build_entity.rb
+++ b/app/serializers/analytics_build_entity.rb
@@ -13,7 +13,7 @@ class AnalyticsBuildEntity < Grape::Entity
end
expose :duration, as: :total_time do |build|
- distance_of_time_as_hash(build.duration.to_f)
+ build_started?(build) ? distance_of_time_as_hash(build.duration.to_f) : {}
end
expose :branch do
@@ -37,4 +37,8 @@ class AnalyticsBuildEntity < Grape::Entity
def url_to(route, build, id = nil)
public_send("#{route}_url", build.project.namespace, build.project, id || build)
end
+
+ def build_started?(build)
+ build.duration && build[:started_at]
+ end
end