diff --git a/ee/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js b/ee/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js index 1c56ec101c11eefec247cf6b7ae48580ad7dbd5a..83db7a8ef794df942417bad413c58f5e67b9ceb5 100644 --- a/ee/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js +++ b/ee/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js @@ -15,7 +15,6 @@ export default class MergeRequestStore extends CEMergeRequestStore { this.secretDetectionHelp = data.secret_detection_help_path; this.dependencyScanningHelp = data.dependency_scanning_help_path; this.canReadVulnerabilities = data.can_read_vulnerabilities; - this.vulnerabilityFeedbackPath = data.vulnerability_feedback_path; this.canReadVulnerabilityFeedback = data.can_read_vulnerability_feedback; this.canRetryExternalStatusChecks = data.can_retry_external_status_checks; this.securityReportsPipelineId = data.pipeline_id; diff --git a/ee/app/serializers/ee/merge_request_widget_entity.rb b/ee/app/serializers/ee/merge_request_widget_entity.rb index 31822e0790f22316d117b5fa992a95a2a261747a..ee6fe103692c7c2a9fd4f4a9a64a9bf89eaeb37e 100644 --- a/ee/app/serializers/ee/merge_request_widget_entity.rb +++ b/ee/app/serializers/ee/merge_request_widget_entity.rb @@ -77,10 +77,6 @@ module MergeRequestWidgetEntity can?(current_user, :read_vulnerability_feedback, merge_request.project) end - expose :vulnerability_feedback_path do |merge_request| - project_vulnerability_feedback_index_path(merge_request.project) - end - expose :create_vulnerability_feedback_issue_path do |merge_request| presenter(merge_request).create_vulnerability_feedback_issue_path(merge_request.project) end diff --git a/ee/spec/fixtures/api/schemas/entities/merge_request_poll_widget.json b/ee/spec/fixtures/api/schemas/entities/merge_request_poll_widget.json index ff859641a26bc8d4a47fe4315970bd80fb3911ea..7ba48428b42e3f4f8d7f075b1b31d4dbd9634000 100644 --- a/ee/spec/fixtures/api/schemas/entities/merge_request_poll_widget.json +++ b/ee/spec/fixtures/api/schemas/entities/merge_request_poll_widget.json @@ -23,9 +23,6 @@ "can_read_vulnerability_feedback": { "type": "boolean" }, - "vulnerability_feedback_path": { - "type": "string" - }, "create_vulnerability_feedback_issue_path": { "type": "string" }, diff --git a/ee/spec/fixtures/api/schemas/entities/merge_request_widget.json b/ee/spec/fixtures/api/schemas/entities/merge_request_widget.json index b12ed590d2e6f0487f780d3a6e1d3239cdc78b99..d54c5a51066866b4fade10966e79396726b89af7 100644 --- a/ee/spec/fixtures/api/schemas/entities/merge_request_widget.json +++ b/ee/spec/fixtures/api/schemas/entities/merge_request_widget.json @@ -1,27 +1,77 @@ { "type": "object", "allOf": [ - { "$ref": "../../../../../../spec/fixtures/api/schemas/entities/merge_request_widget.json" }, + { + "$ref": "../../../../../../spec/fixtures/api/schemas/entities/merge_request_widget.json" + }, { "properties": { "blob_path": { - "head_path": { "type": "string" }, - "base_path": { "type": "string" } + "head_path": { + "type": "string" + }, + "base_path": { + "type": "string" + } }, "codeclimate": { - "head_path": { "type": "string" }, - "base_path": { "type": "string" } - }, - "has_approvals_available": { "type": ["boolean"] }, - "api_approvals_path": { "type": ["string", "null"] }, - "api_approval_settings_path": { "type": ["string", "null"] }, - "api_approve_path": { "type": ["string", "null"] }, - "api_unapprove_path": { "type": ["string", "null"] }, - "vulnerability_feedback_path": { "type": "string" }, - "can_read_vulnerability_feedback": { "type": "boolean" }, - "create_vulnerability_feedback_issue_path": { "type": ["string", "null"] }, - "create_vulnerability_feedback_merge_request_path": { "type": ["string", "null"] }, - "create_vulnerability_feedback_dismissal_path": { "type": ["string", "null"] } + "head_path": { + "type": "string" + }, + "base_path": { + "type": "string" + } + }, + "has_approvals_available": { + "type": [ + "boolean" + ] + }, + "api_approvals_path": { + "type": [ + "string", + "null" + ] + }, + "api_approval_settings_path": { + "type": [ + "string", + "null" + ] + }, + "api_approve_path": { + "type": [ + "string", + "null" + ] + }, + "api_unapprove_path": { + "type": [ + "string", + "null" + ] + }, + "can_read_vulnerability_feedback": { + "type": "boolean" + }, + "create_vulnerability_feedback_issue_path": { + "type": [ + "string", + "null" + ] + }, + "create_vulnerability_feedback_merge_request_path": { + "type": [ + "string", + "null" + ] + }, + "create_vulnerability_feedback_dismissal_path": { + "type": [ + "string", + "null" + ] + } } } ] diff --git a/ee/spec/serializers/merge_request_widget_entity_spec.rb b/ee/spec/serializers/merge_request_widget_entity_spec.rb index fc9d27af1d5091d9bcb07a3b1dfd8c01f3bc84f4..d7645016e79bbd73736b647c7b9ddb348a7479fd 100644 --- a/ee/spec/serializers/merge_request_widget_entity_spec.rb +++ b/ee/spec/serializers/merge_request_widget_entity_spec.rb @@ -224,9 +224,6 @@ def create_all_artifacts end it 'has vulnerability feedback paths' do - expect(subject.as_json[:vulnerability_feedback_path]).to eq( - "/#{merge_request.project.full_path}/-/vulnerability_feedback" - ) expect(subject.as_json).to include(:create_vulnerability_feedback_issue_path) expect(subject.as_json).to include(:create_vulnerability_feedback_merge_request_path) expect(subject.as_json).to include(:create_vulnerability_feedback_dismissal_path)