summaryrefslogtreecommitdiff
path: root/app/serializers/analytics_generic_entity.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/serializers/analytics_generic_entity.rb')
-rw-r--r--app/serializers/analytics_generic_entity.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/app/serializers/analytics_generic_entity.rb b/app/serializers/analytics_generic_entity.rb
index 8c8a40cd90b..d7abe3f5f50 100644
--- a/app/serializers/analytics_generic_entity.rb
+++ b/app/serializers/analytics_generic_entity.rb
@@ -1,10 +1,10 @@
class AnalyticsGenericEntity < Grape::Entity
include RequestAwareEntity
- include ActionView::Helpers::DateHelper
-
+ include EntityDateHelper
expose :title
expose :iid
+ expose :state, if: ->(_instance, options) { options[:request].entity == :merge_request }
expose :author, using: UserEntity
expose :total_time do |object|
@@ -24,8 +24,4 @@ class AnalyticsGenericEntity < Grape::Entity
def url_to(route, id)
public_send("#{route}_url", request.project.namespace, request.project, id)
end
-
- def interval_in_words(diff)
- "#{distance_of_time_in_words(diff.to_f)} ago"
- end
end