Commit ea945865 authored by Oswaldo Ferreira's avatar Oswaldo Ferreira

Simplify metrics fetching for closed/merged MRs

parent c04a97eb
...@@ -205,12 +205,11 @@ class MergeRequestWidgetEntity < IssuableEntity ...@@ -205,12 +205,11 @@ class MergeRequestWidgetEntity < IssuableEntity
def build_metrics(merge_request) def build_metrics(merge_request)
# There's no need to query and serialize metrics data for merge requests that are not # There's no need to query and serialize metrics data for merge requests that are not
# merged or closed. # merged or closed.
case merge_request.state return unless merge_request.merged? || merge_request.closed?
when 'merged' return merge_request.metrics if merge_request.merged? && merge_request.metrics&.merged_by_id
merge_request.metrics&.merged_by_id ? merge_request.metrics : build_metrics_from_events(merge_request) return merge_request.metrics if merge_request.closed? && merge_request.metrics&.latest_closed_by_id
when 'closed'
merge_request.metrics&.latest_closed_by_id ? merge_request.metrics : build_metrics_from_events(merge_request) build_metrics_from_events(merge_request)
end
end end
def build_metrics_from_events(merge_request) def build_metrics_from_events(merge_request)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment