Commit fb72c5db authored by Mike Greiling's avatar Mike Greiling

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

Add missing `render_gfm` import to files

See merge request gitlab-org/gitlab-ce!32830
parents c256adb7 2d94e2c9
import $ from 'jquery'; import $ from 'jquery';
import '~/behaviors/markdown/render_gfm';
import Flash from '../../flash'; import Flash from '../../flash';
import { handleLocationHash } from '../../lib/utils/common_utils'; import { handleLocationHash } from '../../lib/utils/common_utils';
import axios from '../../lib/utils/axios_utils'; import axios from '../../lib/utils/axios_utils';
...@@ -105,7 +106,6 @@ export default class BlobViewer { ...@@ -105,7 +106,6 @@ export default class BlobViewer {
toggleCopyButtonState() { toggleCopyButtonState() {
if (!this.copySourceBtn) return; if (!this.copySourceBtn) return;
if (this.simpleViewer.getAttribute('data-loaded')) { if (this.simpleViewer.getAttribute('data-loaded')) {
this.copySourceBtn.setAttribute('title', __('Copy source to clipboard')); this.copySourceBtn.setAttribute('title', __('Copy source to clipboard'));
this.copySourceBtn.classList.remove('disabled'); this.copySourceBtn.classList.remove('disabled');
...@@ -152,7 +152,6 @@ export default class BlobViewer { ...@@ -152,7 +152,6 @@ export default class BlobViewer {
this.activeViewer = newViewer; this.activeViewer = newViewer;
this.toggleCopyButtonState(); this.toggleCopyButtonState();
BlobViewer.loadViewer(newViewer) BlobViewer.loadViewer(newViewer)
.then(viewer => { .then(viewer => {
$(viewer).renderGFM(); $(viewer).renderGFM();
......
<script> <script>
import { mapActions } from 'vuex'; import { mapActions } from 'vuex';
import $ from 'jquery'; import $ from 'jquery';
import '~/behaviors/markdown/render_gfm';
import getDiscussion from 'ee_else_ce/notes/mixins/get_discussion'; import getDiscussion from 'ee_else_ce/notes/mixins/get_discussion';
import noteEditedText from './note_edited_text.vue'; import noteEditedText from './note_edited_text.vue';
import noteAwardsList from './note_awards_list.vue'; import noteAwardsList from './note_awards_list.vue';
......
<script> <script>
import $ from 'jquery'; import $ from 'jquery';
import '~/behaviors/markdown/render_gfm';
import _ from 'underscore'; import _ from 'underscore';
import { __, sprintf } from '~/locale'; import { __, sprintf } from '~/locale';
import { stripHtml } from '~/lib/utils/text_utility'; import { stripHtml } from '~/lib/utils/text_utility';
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment