diff --git a/app/assets/javascripts/vue_merge_request_widget/index.js b/app/assets/javascripts/vue_merge_request_widget/index.js index 5e9b72e13cfeabc99e615f58c0b6c886ea19db48..cc2ee5087837d9c74548c40f793e5daa54f557ad 100644 --- a/app/assets/javascripts/vue_merge_request_widget/index.js +++ b/app/assets/javascripts/vue_merge_request_widget/index.js @@ -47,6 +47,7 @@ export default () => { ), commitPathTemplate: gl.mrWidgetData.commit_path_template, dismissalDescriptions, + validityChecksEnabled: gl.mrWidgetData.validity_checks_enabled, }, ...MrWidgetOptions, apolloProvider, @@ -55,4 +56,6 @@ export default () => { window.gl.mrWidget = { checkStatus: vm.checkStatus, }; + + console.log('>>>>', gl.mrWidgetData.validity_checks_enabled); }; diff --git a/app/views/projects/merge_requests/_widget.html.haml b/app/views/projects/merge_requests/_widget.html.haml index ea3af550a1537713e952b7daa9baed25de510aa0..2244742e2ef569d0d147ce919f3c949eeae68c02 100644 --- a/app/views/projects/merge_requests/_widget.html.haml +++ b/app/views/projects/merge_requests/_widget.html.haml @@ -22,7 +22,8 @@ window.gl.mrWidgetData.can_view_false_positive = '#{@merge_request.project.licensed_feature_available?(:sast_fp_reduction).to_s}'; window.gl.mrWidgetData.user_preferences_gitpod_path = '#{profile_preferences_path(anchor: 'user_gitpod_enabled')}'; window.gl.mrWidgetData.user_profile_enable_gitpod_path = '#{user_settings_profile_path(user: { gitpod_enabled: true })}'; - window.gl.mrWidgetData.saml_approval_path = window.gl.mrWidgetData.saml_approval_path + window.gl.mrWidgetData.saml_approval_path = window.gl.mrWidgetData.saml_approval_path; + window.gl.mrWidgetData.validity_checks_enabled = '#{@merge_request.project&.security_setting&.validity_checks_enabled&.to_s}'; %h2#merge-request-widgets-heading.gl-sr-only = _("Merge request reports") diff --git a/ee/app/assets/javascripts/security_dashboard/components/pipeline/vulnerability_finding_modal.vue b/ee/app/assets/javascripts/security_dashboard/components/pipeline/vulnerability_finding_modal.vue index 45722d8cbdd8ed98148eef164ebf3e8aa1c38093..73e3049d3c50f87f9e0b79c3f62745f08f1f22c3 100644 --- a/ee/app/assets/javascripts/security_dashboard/components/pipeline/vulnerability_finding_modal.vue +++ b/ee/app/assets/javascripts/security_dashboard/components/pipeline/vulnerability_finding_modal.vue @@ -76,6 +76,11 @@ export default { ResolveWithAiButton, }, mixins: [glAbilitiesMixin()], + inject: { + validity_checks_enabled: { + default: false, + }, + }, props: { findingUuid: { type: String,