Merge branch 'suggestion-dashes' into 'master'

Fixes diff sugestions removing dashes from diff

Closes #55634

See merge request gitlab-org/gitlab-ce!23994

2 files changed, 2 insertions, 4 deletions

diff --git a/app/assets/javascripts/vue_shared/components/markdown/field.vue b/app/assets/javascripts/vue_shared/components/markdown/field.vue
index 2f7ed4a982c..937a2847a58 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/field.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/field.vue
@@ -89,7 +89,6 @@ export default {
       return this.referencedUsers.length >= referencedUsersThreshold;
     },
     lineContent() {
-      const FIRST_CHAR_REGEX = /^(\+|-)/;
       const [firstSuggestion] = this.suggestions;
       if (firstSuggestion) {
         return firstSuggestion.from_content;
@@ -99,7 +98,7 @@ export default {
         const { rich_text: richText, text } = this.line;
 
         if (text) {
-          return text.replace(FIRST_CHAR_REGEX, '');
+          return text;
         }
 
         return _.unescape(stripHtml(richText).replace(/\n/g, ''));
diff --git a/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue b/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue
index 7c6dbee3e19..721f0276ac8 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue
@@ -82,13 +82,12 @@ export default {
       // extracts the suggested lines from the markdown
       // calculates a line number for each line
 
-      const FIRST_CHAR_REGEX = /^(\+|-)/;
       const newLines = suggestionEl.querySelectorAll('.line');
       const fromLine = this.suggestions.length ? this.suggestions[0].from_line : this.fromLine;
       const lines = [];
 
       newLines.forEach((line, i) => {
-        const content = `${line.innerText.replace(FIRST_CHAR_REGEX, '')}\n`;
+        const content = `${line.innerText}\n`;
         const lineNumber = fromLine + i;
         lines.push({ content, lineNumber });
       });