From 835f1214dcc4e08e3076f269b7b2aa854ea4257a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sun, 14 Feb 2021 18:09:20 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/assets/javascripts/blob_edit/blob_bundle.js | 2 +- app/assets/javascripts/blob_edit/edit_blob.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'app/assets/javascripts/blob_edit') diff --git a/app/assets/javascripts/blob_edit/blob_bundle.js b/app/assets/javascripts/blob_edit/blob_bundle.js index 76c88efc12b..173c82ef9b0 100644 --- a/app/assets/javascripts/blob_edit/blob_bundle.js +++ b/app/assets/javascripts/blob_edit/blob_bundle.js @@ -1,8 +1,8 @@ /* eslint-disable no-new */ import $ from 'jquery'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; import initPopover from '~/blob/suggest_gitlab_ci_yml'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import { disableButtonIfEmptyField, setCookie } from '~/lib/utils/common_utils'; import Tracking from '~/tracking'; import BlobFileDropzone from '../blob/blob_file_dropzone'; diff --git a/app/assets/javascripts/blob_edit/edit_blob.js b/app/assets/javascripts/blob_edit/edit_blob.js index f3b0f4ab57c..7c8f6646c0d 100644 --- a/app/assets/javascripts/blob_edit/edit_blob.js +++ b/app/assets/javascripts/blob_edit/edit_blob.js @@ -1,9 +1,9 @@ import $ from 'jquery'; -import axios from '~/lib/utils/axios_utils'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; -import { addEditorMarkdownListeners } from '~/lib/utils/text_markdown'; import EditorLite from '~/editor/editor_lite'; import { FileTemplateExtension } from '~/editor/extensions/editor_file_template_ext'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; +import { addEditorMarkdownListeners } from '~/lib/utils/text_markdown'; import { insertFinalNewline } from '~/lib/utils/text_utility'; import TemplateSelectorMediator from '../blob/file_template_mediator'; import { BLOB_EDITOR_ERROR, BLOB_PREVIEW_ERROR } from './constants'; -- cgit v1.2.3