diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-18 00:09:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-18 00:09:56 +0300 |
| commit | 9facfe5cb194005894467c06e4ea1a9800034ab4 (patch) | |
| tree | 5ceaecd5f89725250bbf4119558715fa14576c4c /app/assets/javascripts/blob | |
| parent | 18da92341dac366b7bcfd13f2d3c443ffa315af0 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/blob')
5 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/blob/components/blob_content_error.vue b/app/assets/javascripts/blob/components/blob_content_error.vue index 44dc4a6c727..7344b9cdff5 100644 --- a/app/assets/javascripts/blob/components/blob_content_error.vue +++ b/app/assets/javascripts/blob/components/blob_content_error.vue @@ -1,6 +1,6 @@ <script> -import { __ } from '~/locale'; import { GlSprintf, GlLink } from '@gitlab/ui'; +import { __ } from '~/locale'; import { BLOB_RENDER_ERRORS } from './constants'; export default { diff --git a/app/assets/javascripts/blob/components/blob_edit_content.vue b/app/assets/javascripts/blob/components/blob_edit_content.vue index 477e8bae399..26ba7b98a39 100644 --- a/app/assets/javascripts/blob/components/blob_edit_content.vue +++ b/app/assets/javascripts/blob/components/blob_edit_content.vue @@ -1,6 +1,6 @@ <script> -import { initEditorLite } from '~/blob/utils'; import { debounce } from 'lodash'; +import { initEditorLite } from '~/blob/utils'; import { SNIPPET_MARK_BLOBS_CONTENT, SNIPPET_MARK_EDIT_APP_START, diff --git a/app/assets/javascripts/blob/notebook/notebook_viewer.vue b/app/assets/javascripts/blob/notebook/notebook_viewer.vue index b1713989997..ea33d621d47 100644 --- a/app/assets/javascripts/blob/notebook/notebook_viewer.vue +++ b/app/assets/javascripts/blob/notebook/notebook_viewer.vue @@ -1,7 +1,7 @@ <script> +import { GlLoadingIcon } from '@gitlab/ui'; import axios from '~/lib/utils/axios_utils'; import notebookLab from '~/notebook/index.vue'; -import { GlLoadingIcon } from '@gitlab/ui'; export default { components: { diff --git a/app/assets/javascripts/blob/pdf/pdf_viewer.vue b/app/assets/javascripts/blob/pdf/pdf_viewer.vue index 64fc832ee54..96d6f500960 100644 --- a/app/assets/javascripts/blob/pdf/pdf_viewer.vue +++ b/app/assets/javascripts/blob/pdf/pdf_viewer.vue @@ -1,6 +1,6 @@ <script> -import PdfLab from '../../pdf/index.vue'; import { GlLoadingIcon } from '@gitlab/ui'; +import PdfLab from '../../pdf/index.vue'; export default { components: { diff --git a/app/assets/javascripts/blob/pipeline_tour_success_modal.vue b/app/assets/javascripts/blob/pipeline_tour_success_modal.vue index ca4750f73d2..90eafb75758 100644 --- a/app/assets/javascripts/blob/pipeline_tour_success_modal.vue +++ b/app/assets/javascripts/blob/pipeline_tour_success_modal.vue @@ -1,7 +1,7 @@ <script> import { GlModal, GlSprintf, GlLink } from '@gitlab/ui'; -import { sprintf, s__, __ } from '~/locale'; import Cookies from 'js-cookie'; +import { sprintf, s__, __ } from '~/locale'; import { glEmojiTag } from '~/emoji'; import Tracking from '~/tracking'; |