diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-09-05 17:03:41 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-09-05 17:03:41 +0000 |
| commit | f7e7ee713aa21874bf6810d01976c2b5342c0995 (patch) | |
| tree | 7a9483a4dbcd244b5b643f4d1a46855bc3fc417b | |
| parent | 5f813436d9bb01fc82459aea4dee0704590fd763 (diff) | |
| parent | 46f6a4e0777124b893dad80cb9e38de4a7f2f7f5 (diff) | |
| download | gitlab-ce-f7e7ee713aa21874bf6810d01976c2b5342c0995.tar.gz | |
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
| -rw-r--r-- | app/models/merge_request.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index bc98ae0ce28..95daa48d4bc 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -1238,9 +1238,9 @@ class MergeRequest < ApplicationRecord compare_reports(Ci::CompareTestReportsService) end - def compare_reports(service_class) + def compare_reports(service_class, current_user = nil) 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) raise InvalidateReactiveCache end |