diff options
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/components')
-rw-r--r-- | app/assets/javascripts/merge_conflicts/components/diff_file_editor.vue | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.vue b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.vue index 04e493712ec..7168efa28ad 100644 --- a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.vue +++ b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.vue @@ -2,7 +2,7 @@ import { GlButton } from '@gitlab/ui'; import { debounce } from 'lodash'; import { mapActions } from 'vuex'; -import { deprecatedCreateFlash as flash } from '~/flash'; +import createFlash from '~/flash'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; import { INTERACTIVE_RESOLVE_MODE } from '../constants'; @@ -50,13 +50,13 @@ export default { methods: { ...mapActions(['setFileResolveMode', 'setPromptConfirmationState', 'updateFile']), loadEditor() { - const EditorPromise = import(/* webpackChunkName: 'EditorLite' */ '~/editor/editor_lite'); + const EditorPromise = import(/* webpackChunkName: 'SourceEditor' */ '~/editor/source_editor'); const DataPromise = axios.get(this.file.content_path); Promise.all([EditorPromise, DataPromise]) .then( ([ - { default: EditorLite }, + { default: SourceEditor }, { data: { content, new_path: path }, }, @@ -66,7 +66,7 @@ export default { this.originalContent = content; this.fileLoaded = true; - this.editor = new EditorLite().createInstance({ + this.editor = new SourceEditor().createInstance({ el: contentEl, blobPath: path, blobContent: content, @@ -75,7 +75,9 @@ export default { }, ) .catch(() => { - flash(__('An error occurred while loading the file')); + createFlash({ + message: __('An error occurred while loading the file'), + }); }); }, saveDiffResolution() { |