diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
commit | 48aff82709769b098321c738f3444b9bdaa694c6 (patch) | |
tree | e00c7c43e2d9b603a5a6af576b1685e400410dee /app/serializers/merge_request_widget_entity.rb | |
parent | 879f5329ee916a948223f8f43d77fba4da6cd028 (diff) |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'app/serializers/merge_request_widget_entity.rb')
-rw-r--r-- | app/serializers/merge_request_widget_entity.rb | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/app/serializers/merge_request_widget_entity.rb b/app/serializers/merge_request_widget_entity.rb index 494192c8dbb..44cbcfc5044 100644 --- a/app/serializers/merge_request_widget_entity.rb +++ b/app/serializers/merge_request_widget_entity.rb @@ -67,15 +67,15 @@ class MergeRequestWidgetEntity < Grape::Entity ) end - expose :user_callouts_path, if: -> (*) { Feature.enabled?(:suggest_pipeline) } do |merge_request| + expose :user_callouts_path, if: -> (_, opts) { opts[:experiment_enabled] == :suggest_pipeline } do |_merge_request| user_callouts_path end - expose :suggest_pipeline_feature_id, if: -> (*) { Feature.enabled?(:suggest_pipeline) } do |merge_request| + expose :suggest_pipeline_feature_id, if: -> (_, opts) { opts[:experiment_enabled] == :suggest_pipeline } do |_merge_request| SUGGEST_PIPELINE end - expose :is_dismissed_suggest_pipeline, if: -> (*) { Feature.enabled?(:suggest_pipeline) } do |merge_request| + expose :is_dismissed_suggest_pipeline, if: -> (_, opts) { opts[:experiment_enabled] == :suggest_pipeline } do |_merge_request| current_user && current_user.dismissed_callout?(feature_name: SUGGEST_PIPELINE) end @@ -120,10 +120,18 @@ class MergeRequestWidgetEntity < Grape::Entity end expose :base_path do |merge_request| - base_pipeline_downloadable_path_for_report_type(:codequality) + if use_merge_base_with_merged_results? + merge_base_pipeline_downloadable_path_for_report_type(:codequality) + else + base_pipeline_downloadable_path_for_report_type(:codequality) + end end end + expose :security_reports_docs_path do |merge_request| + help_page_path('user/application_security/sast/index.md', anchor: 'reports-json-format') + end + private delegate :current_user, to: :request @@ -152,6 +160,16 @@ class MergeRequestWidgetEntity < Grape::Entity object.base_pipeline&.present(current_user: current_user) &.downloadable_path_for_report_type(file_type) end + + def use_merge_base_with_merged_results? + Feature.enabled?(:merge_base_pipelines, object.target_project) && + object.actual_head_pipeline&.merge_request_event_type == :merged_result + end + + def merge_base_pipeline_downloadable_path_for_report_type(file_type) + object.merge_base_pipeline&.present(current_user: current_user) + &.downloadable_path_for_report_type(file_type) + end end MergeRequestWidgetEntity.prepend_if_ee('EE::MergeRequestWidgetEntity') |