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-01 18:08:56 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-02-01 18:08:56 +0300
commite92c95bf459ea6237b1fe1cbd3e6fc7d0eca8f85 (patch)
tree080fec6e5ea63a30f6d1f313d585266e88db2344 /app/assets/javascripts/merge_request.js
parent9ecdb93f4e7e85ffc1e7a768780bb1279827a6aa (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/merge_request.js')
-rw-r--r--app/assets/javascripts/merge_request.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request.js b/app/assets/javascripts/merge_request.js
index bf9e0a309dd..7bcfe529175 100644
--- a/app/assets/javascripts/merge_request.js
+++ b/app/assets/javascripts/merge_request.js
@@ -1,10 +1,10 @@
/* eslint-disable func-names, no-underscore-dangle, consistent-return */
import $ from 'jquery';
-import axios from './lib/utils/axios_utils';
import { __ } from '~/locale';
import eventHub from '~/vue_merge_request_widget/event_hub';
import { deprecatedCreateFlash as createFlash } from '~/flash';
+import axios from './lib/utils/axios_utils';
import TaskList from './task_list';
import MergeRequestTabs from './merge_request_tabs';
import { addDelimiter } from './lib/utils/text_utility';