diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index cbe5b10bad84aa980e7762ecc0f3e4c40abb958e..bd17f1f2a70f00e2cc16b4cec59fbe25b3adefad 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -45,6 +45,8 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo push_frontend_feature_flag(:ci_graphql_pipeline_mini_graph, project) push_frontend_feature_flag(:notifications_todos_buttons, current_user) push_frontend_feature_flag(:reviewer_assign_drawer, current_user) + push_frontend_feature_flag(:vulnerability_code_flow, project) + push_frontend_feature_flag(:pipeline_vulnerability_code_flow, project) push_frontend_feature_flag(:issue_autocomplete_backend_filtering, project) push_frontend_feature_flag(:realtime_issuable_todo, current_user) end diff --git a/ee/config/feature_flags/beta/vulnerability_code_flow.yml b/config/feature_flags/beta/vulnerability_code_flow.yml similarity index 100% rename from ee/config/feature_flags/beta/vulnerability_code_flow.yml rename to config/feature_flags/beta/vulnerability_code_flow.yml 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 fd345973d57e762ed8e40c355a9e65521b8fd51c..c2caaf1fdfcba6b04278c30cfca41048222f6dff 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 @@ -593,6 +593,7 @@ export default { <vulnerability-code-flow :branch-ref="ref" :details="codeFlowData" + :project-full-path="projectFullPath" :description="finding.description" :description-html="finding.descriptionHtml" /> diff --git a/ee/app/assets/javascripts/vue_shared/components/code_flow/vulnerability_code_flow.vue b/ee/app/assets/javascripts/vue_shared/components/code_flow/vulnerability_code_flow.vue index 036d8c1ba1a53a00250ecb6a5fa36b0c8efa5e78..4978a84f76965a8f4452ee5b9ac46efbfb0b1f26 100644 --- a/ee/app/assets/javascripts/vue_shared/components/code_flow/vulnerability_code_flow.vue +++ b/ee/app/assets/javascripts/vue_shared/components/code_flow/vulnerability_code_flow.vue @@ -17,7 +17,6 @@ export default { CodeFlowFileViewer, CodeFlowStepsSection, }, - inject: ['projectFullPath'], props: { branchRef: { type: String, @@ -27,6 +26,11 @@ export default { type: Object, required: true, }, + projectFullPath: { + type: String, + required: true, + default: '', + }, description: { type: String, required: false, diff --git a/ee/app/assets/javascripts/vulnerabilities/components/vulnerability.vue b/ee/app/assets/javascripts/vulnerabilities/components/vulnerability.vue index a50e217ec6e2689f9cc47a48633c99a76fe0b87f..757a7718daa126b6f9ed233d120604dc2a55f38f 100644 --- a/ee/app/assets/javascripts/vulnerabilities/components/vulnerability.vue +++ b/ee/app/assets/javascripts/vulnerabilities/components/vulnerability.vue @@ -37,6 +37,7 @@ export default { GlTab, }, mixins: [glFeatureFlagMixin()], + inject: ['projectFullPath'], props: { initialVulnerability: { type: Object, @@ -163,6 +164,7 @@ export default { <vulnerability-code-flow :branch-ref="ref" :details="vulnerability.details.codeFlows" + :project-full-path="projectFullPath" :description="vulnerability.description" :description-html="vulnerability.descriptionHtml" /> diff --git a/ee/spec/frontend/vulnerabilities/vulnerability_code_flow_spec.js b/ee/spec/frontend/vulnerabilities/vulnerability_code_flow_spec.js index c308ab3bcb713b9b1e6960070ef1482a9e3b1f7a..284d3fed69aa79ce4a5df82494e2243545607bcd 100644 --- a/ee/spec/frontend/vulnerabilities/vulnerability_code_flow_spec.js +++ b/ee/spec/frontend/vulnerabilities/vulnerability_code_flow_spec.js @@ -33,12 +33,12 @@ describe('Vulnerability Code Flow', () => { descriptionHtml: mockVulnerability.descriptionHtml, branchRef: codeFlowProps.branchRef, details: mockVulnerability.details, + projectFullPath: codeFlowProps.projectFullPath, ...vulnerabilityOverrides, }; wrapper = shallowMountExtended(VulnerabilityCodeFlow, { apolloProvider: createMockApollo([[blobInfoQuery, mutationResponse]]), - provide: { projectFullPath: codeFlowProps.projectFullPath }, propsData, }); }; diff --git a/ee/spec/frontend/vulnerabilities/vulnerability_spec.js b/ee/spec/frontend/vulnerabilities/vulnerability_spec.js index 266c3d29d0b2f40f5b90792a9207b86dc065b129..2eaf075fa2f2a07b255a6650a0fac1097e475d44 100644 --- a/ee/spec/frontend/vulnerabilities/vulnerability_spec.js +++ b/ee/spec/frontend/vulnerabilities/vulnerability_spec.js @@ -94,6 +94,7 @@ describe('Vulnerability', () => { }, provide: { glFeatures: { vulnerabilityCodeFlow }, + projectFullPath: 'project/full/path', }, stubs: { VulnerabilityFooter: stubComponent(VulnerabilityFooter),