Commit f7e7ee71 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'add-approval-status-field-lm-ce' into 'master'

Extend License Compliance entity for Pipelines and MR view

See merge request gitlab-org/gitlab-ce!32709
parents 5f813436 46f6a4e0
...@@ -1238,9 +1238,9 @@ class MergeRequest < ApplicationRecord ...@@ -1238,9 +1238,9 @@ class MergeRequest < ApplicationRecord
compare_reports(Ci::CompareTestReportsService) compare_reports(Ci::CompareTestReportsService)
end end
def compare_reports(service_class) def compare_reports(service_class, current_user = nil)
with_reactive_cache(service_class.name) do |data| with_reactive_cache(service_class.name) do |data|
unless service_class.new(project) unless service_class.new(project, current_user)
.latest?(base_pipeline, actual_head_pipeline, data) .latest?(base_pipeline, actual_head_pipeline, data)
raise InvalidateReactiveCache raise InvalidateReactiveCache
end end
......
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