summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget/stores
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/stores')
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js2
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js14
2 files changed, 0 insertions, 16 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js b/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js
index 18d955652ba..7a458f9ce7e 100644
--- a/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js
+++ b/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js
@@ -27,8 +27,6 @@ export default function deviseState() {
return stateKey.shaMismatch;
} else if (this.autoMergeEnabled && !this.mergeError) {
return stateKey.autoMergeEnabled;
- } else if (!this.canMerge && !window.gon?.features?.restructuredMrWidget) {
- return stateKey.notAllowedToMerge;
} else if (this.canBeMerged) {
return stateKey.readyToMerge;
}
diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
index 03c9a01cc7a..146cf7e11a7 100644
--- a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
+++ b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
@@ -33,7 +33,6 @@ export default class MergeRequestStore {
this.setData(data);
this.initCodeQualityReport(data);
- this.initSecurityReport(data);
this.setGitpodData(data);
}
@@ -42,19 +41,6 @@ export default class MergeRequestStore {
this.codeQuality = data.codequality_reports_path;
}
- initSecurityReport(data) {
- // TODO: check if gl.mrWidgetData can be safely removed after we migrate to the
- // widget extension.
- this.securityReportPaths = {
- apiFuzzingReportPath: data.api_fuzzing_comparison_path,
- coverageFuzzingReportPath: data.coverage_fuzzing_comparison_path,
- sastReportPath: data.sast_comparison_path,
- dastReportPath: data.dast_comparison_path,
- secretDetectionReportPath: data.secret_detection_comparison_path,
- dependencyScanningReportPath: data.dependency_scanning_comparison_path,
- };
- }
-
setData(data, isRebased) {
this.initApprovals();