Merge branch 'add-missing-render-gfm' into 'master'

Add missing `render_gfm` import to files

See merge request gitlab-org/gitlab-ce!32830

3 files changed, 3 insertions, 2 deletions

diff --git a/app/assets/javascripts/blob/viewer/index.js b/app/assets/javascripts/blob/viewer/index.js
index d246a1f6064..9ea455069f3 100644
--- a/app/assets/javascripts/blob/viewer/index.js
+++ b/app/assets/javascripts/blob/viewer/index.js
@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import '~/behaviors/markdown/render_gfm';
 import Flash from '../../flash';
 import { handleLocationHash } from '../../lib/utils/common_utils';
 import axios from '../../lib/utils/axios_utils';
@@ -105,7 +106,6 @@ export default class BlobViewer {
 
   toggleCopyButtonState() {
     if (!this.copySourceBtn) return;
-
     if (this.simpleViewer.getAttribute('data-loaded')) {
       this.copySourceBtn.setAttribute('title', __('Copy source to clipboard'));
       this.copySourceBtn.classList.remove('disabled');
@@ -152,7 +152,6 @@ export default class BlobViewer {
     this.activeViewer = newViewer;
 
     this.toggleCopyButtonState();
-
     BlobViewer.loadViewer(newViewer)
       .then(viewer => {
         $(viewer).renderGFM();
diff --git a/app/assets/javascripts/notes/components/note_body.vue b/app/assets/javascripts/notes/components/note_body.vue
index 88454c3fb4c..358f49deb35 100644
--- a/app/assets/javascripts/notes/components/note_body.vue
+++ b/app/assets/javascripts/notes/components/note_body.vue
@@ -1,6 +1,7 @@
 <script>
 import { mapActions } from 'vuex';
 import $ from 'jquery';
+import '~/behaviors/markdown/render_gfm';
 import getDiscussion from 'ee_else_ce/notes/mixins/get_discussion';
 import noteEditedText from './note_edited_text.vue';
 import noteAwardsList from './note_awards_list.vue';
diff --git a/app/assets/javascripts/vue_shared/components/markdown/field.vue b/app/assets/javascripts/vue_shared/components/markdown/field.vue
index a32ed529342..326440f5013 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/field.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/field.vue
@@ -1,5 +1,6 @@
 <script>
 import $ from 'jquery';
+import '~/behaviors/markdown/render_gfm';
 import _ from 'underscore';
 import { __, sprintf } from '~/locale';
 import { stripHtml } from '~/lib/utils/text_utility';