diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 12:09:17 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 12:09:17 +0000 |
| commit | cd52759ee33051b8ad7b88b02ba7954e4fad7018 (patch) | |
| tree | f1096c68e457aef7f5201acd16e4a751ff538026 /app/assets | |
| parent | 18f7828977b74bf6e5153594a098ef90e773b3b7 (diff) | |
| download | gitlab-ce-cd52759ee33051b8ad7b88b02ba7954e4fad7018.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/snippets/components/snippet_title.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/snippets/fragments/snippetBase.fragment.graphql | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/snippets/components/snippet_title.vue b/app/assets/javascripts/snippets/components/snippet_title.vue index 6646e70f5db..1fc0423a06c 100644 --- a/app/assets/javascripts/snippets/components/snippet_title.vue +++ b/app/assets/javascripts/snippets/components/snippet_title.vue @@ -21,7 +21,7 @@ export default { {{ snippet.title }} </h2> <div v-if="snippet.description" class="description" data-qa-selector="snippet_description"> - <div class="md">{{ snippet.description }}</div> + <div class="md js-snippet-description" v-html="snippet.descriptionHtml"></div> </div> <small v-if="snippet.updatedAt !== snippet.createdAt" class="edited-text"> diff --git a/app/assets/javascripts/snippets/fragments/snippetBase.fragment.graphql b/app/assets/javascripts/snippets/fragments/snippetBase.fragment.graphql index 57348a422ec..e0cc6cc2dda 100644 --- a/app/assets/javascripts/snippets/fragments/snippetBase.fragment.graphql +++ b/app/assets/javascripts/snippets/fragments/snippetBase.fragment.graphql @@ -2,6 +2,7 @@ fragment SnippetBase on Snippet { id title description + descriptionHtml createdAt updatedAt visibilityLevel |