diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-19 00:10:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-19 00:10:06 +0300 |
commit | cb0a625459525122d2736a895a728edb3b8ea4ff (patch) | |
tree | a3a830de41cdc0eb71c380f8e751faa1410a724a /app/assets/javascripts/merge_conflicts | |
parent | dd6e32bf47776514b8fe2abcfe7998503f16baab (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/merge_conflicts')
-rw-r--r-- | app/assets/javascripts/merge_conflicts/components/diff_file_editor.vue | 6 |
1 files changed, 3 insertions, 3 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 f09aebea431..7168efa28ad 100644 --- a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.vue +++ b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.vue @@ -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, |