diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-03-20 05:18:21 +0000 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-03-20 05:18:21 +0000 |
commit | 5f6754185fc8bca6bb510a0aa17410dbffa293ff (patch) | |
tree | 962aebefcc08a99515b33364592c0e566cfd785e /spec/javascripts/notes_spec.js | |
parent | 956bd6a45861dccc40591e02cf36e895a6fc4f5b (diff) | |
parent | c1708514f594040deedb87216945a29c3bc28bb9 (diff) | |
download | gitlab-ce-5f6754185fc8bca6bb510a0aa17410dbffa293ff.tar.gz |
Merge branch 'move-render-gfm' into 'master'
Move render gfm to commons and update imports
See merge request gitlab-org/gitlab-ce!15993
Diffstat (limited to 'spec/javascripts/notes_spec.js')
-rw-r--r-- | spec/javascripts/notes_spec.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/notes_spec.js b/spec/javascripts/notes_spec.js index ba0a70bed17..8f317b06792 100644 --- a/spec/javascripts/notes_spec.js +++ b/spec/javascripts/notes_spec.js @@ -7,7 +7,7 @@ import * as urlUtils from '~/lib/utils/url_utility'; import 'autosize'; import '~/gl_form'; import '~/lib/utils/text_utility'; -import '~/render_gfm'; +import '~/behaviors/markdown/render_gfm'; import Notes from '~/notes'; import timeoutPromise from './helpers/set_timeout_promise_helper'; |