Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-02-14 21:09:20 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-02-14 21:09:20 +0300
commit835f1214dcc4e08e3076f269b7b2aa854ea4257a (patch)
tree07366d250301a8b2a8d7f24d220f4db21b5f6f59 /app/assets/javascripts/single_file_diff.js
parent8309ef26ed9ae22e3115a0203dfff302812c154a (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/single_file_diff.js')
-rw-r--r--app/assets/javascripts/single_file_diff.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/single_file_diff.js b/app/assets/javascripts/single_file_diff.js
index 5b40140a232..687289b6675 100644
--- a/app/assets/javascripts/single_file_diff.js
+++ b/app/assets/javascripts/single_file_diff.js
@@ -2,11 +2,11 @@
import $ from 'jquery';
import { spriteIcon } from '~/lib/utils/common_utils';
-import { __ } from './locale';
-import axios from './lib/utils/axios_utils';
-import { deprecatedCreateFlash as createFlash } from './flash';
import FilesCommentButton from './files_comment_button';
+import { deprecatedCreateFlash as createFlash } from './flash';
import initImageDiffHelper from './image_diff/helpers/init_image_diff';
+import axios from './lib/utils/axios_utils';
+import { __ } from './locale';
import syntaxHighlight from './syntax_highlight';
const WRAPPER = '<div class="diff-content"></div>';