diff options
| author | Phil Hughes <me@iamphill.com> | 2018-12-12 09:31:22 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2018-12-12 09:50:44 +0000 |
| commit | 828b29e9e346731b756d6d06460fbccb7a9f2d7e (patch) | |
| tree | 70ec925f12f80b96ad7544ea4f261a303ba6965f /spec | |
| parent | 13bc96b60c458663b87c0d485b909de94ebc346e (diff) | |
| download | gitlab-ce-828b29e9e346731b756d6d06460fbccb7a9f2d7e.tar.gz | |
Merge branch 'winh-markdown-preview-lists' into 'master'
Remove unnecessary div from MarkdownField to apply list styles correctly
Closes #55190
See merge request gitlab-org/gitlab-ce!23733
(cherry picked from commit 2155395025422d106968964ea59b109caa142ba4)
1285fe68 Remove unnecessary div from MarkdownField to apply list styles correctly
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/javascripts/vue_shared/components/markdown/field_spec.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/vue_shared/components/markdown/field_spec.js b/spec/javascripts/vue_shared/components/markdown/field_spec.js index abb17440c0e..79e0e756a7a 100644 --- a/spec/javascripts/vue_shared/components/markdown/field_spec.js +++ b/spec/javascripts/vue_shared/components/markdown/field_spec.js @@ -80,7 +80,7 @@ describe('Markdown field component', () => { previewLink.click(); Vue.nextTick(() => { - expect(vm.$el.querySelector('.md-preview').textContent.trim()).toContain('Loading...'); + expect(vm.$el.querySelector('.md-preview').textContent.trim()).toContain('Loading…'); done(); }); |