diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-24 12:07:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-24 12:07:44 +0300 |
commit | 6593f1f627938f22090dec5221476772d3ed581d (patch) | |
tree | ac5b9adf00f24f1d7cbc59c7d78f7c4fd06a0001 /app/assets/javascripts/vue_shared/components | |
parent | 2f369bd95866b7f623387ce2b6acf646df3d5222 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/lib/utils/diff_utils.js | 1 | ||||
-rw-r--r-- | app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_row.vue | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_shared/components/lib/utils/diff_utils.js b/app/assets/javascripts/vue_shared/components/lib/utils/diff_utils.js index d1aba99ac22..188ab1769a4 100644 --- a/app/assets/javascripts/vue_shared/components/lib/utils/diff_utils.js +++ b/app/assets/javascripts/vue_shared/components/lib/utils/diff_utils.js @@ -12,6 +12,7 @@ function cleanSuggestionLine(line = {}) { return { ...line, text: trimFirstCharOfLineContent(line.text), + rich_text: trimFirstCharOfLineContent(line.rich_text), }; } diff --git a/app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_row.vue b/app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_row.vue index c09bdfec250..97d93eaaf3f 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_row.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_row.vue @@ -24,7 +24,8 @@ export default { {{ line.new_line }} </td> <td class="line_content" :class="lineType"> - <span v-if="line.text">{{ line.text }}</span> + <span v-if="line.rich_text" v-html="line.rich_text"></span> + <span v-else-if="line.text">{{ line.text }}</span> <!-- TODO: replace this hack with zero-width whitespace when we have rich_text from BE --> <span v-else>​</span> </td> |