From 96f153c6ac901143ec73c1c6ee576b27b74c64d5 Mon Sep 17 00:00:00 2001
From: Amy Qualls <aqualls@gitlab.com>
Date: Wed, 30 Mar 2022 10:49:37 +0000
Subject: [PATCH] Update help link in UI to remove 'ee'
The destination for this link is incorrect; we should strip out the
EE.
Changelog: changed
---
.../components/mr_widget_how_to_merge_modal.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_how_to_merge_modal.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_how_to_merge_modal.vue
index b062833cdf88a..e906b8c3b5924 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_how_to_merge_modal.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_how_to_merge_modal.vue
@@ -79,7 +79,7 @@ export default {
},
data() {
return {
- resolveConflictsFromCli: helpPagePath('ee/user/project/merge_requests/conflicts.html', {
+ resolveConflictsFromCli: helpPagePath('user/project/merge_requests/conflicts', {
anchor: 'resolve-conflicts-from-the-command-line',
}),
};
--
GitLab