diff options
author | Kushal Pandya <kushalspandya@gmail.com> | 2019-01-07 08:55:43 +0000 |
---|---|---|
committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-01-07 08:55:43 +0000 |
commit | 32f80629bdbd4d2fcd43b6220da373394ffd95b6 (patch) | |
tree | f83078f5ef1f8edc34b3d41fccfe2e99a862f0d8 /app/assets | |
parent | 855df0ceaaee3e6ff75a4a21d838588086e1a3a9 (diff) | |
parent | e6f1209ebf87c61e36c1efdb304dbf9d32d6cbb9 (diff) | |
download | gitlab-ce-32f80629bdbd4d2fcd43b6220da373394ffd95b6.tar.gz |
Merge branch 'suggestion-dashes' into 'master'
Fixes diff sugestions removing dashes from diff
Closes #55634
See merge request gitlab-org/gitlab-ce!23994
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/markdown/field.vue | 3 | ||||
-rw-r--r-- | app/assets/javascripts/vue_shared/components/markdown/suggestions.vue | 3 |
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 }); }); |