summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/blob
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-09 12:07:58 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-09 12:07:58 +0000
commit93c6764dacd4c605027ef1cd367d3aebe420b223 (patch)
tree5213b1fc874ee3e31701a81007f97d7664b95205 /app/assets/javascripts/blob
parentaa10b541b6a3fbc7fa712abcc59d073fc8dc620a (diff)
downloadgitlab-ce-93c6764dacd4c605027ef1cd367d3aebe420b223.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/blob')
-rw-r--r--app/assets/javascripts/blob/file_template_mediator.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/blob/file_template_mediator.js b/app/assets/javascripts/blob/file_template_mediator.js
index aedd8004ea5..2df7a84ead0 100644
--- a/app/assets/javascripts/blob/file_template_mediator.js
+++ b/app/assets/javascripts/blob/file_template_mediator.js
@@ -1,6 +1,6 @@
+import $ from 'jquery';
import Api from '~/api';
-import $ from 'jquery';
import Flash from '../flash';
import FileTemplateTypeSelector from './template_selectors/type_selector';
import BlobCiYamlSelector from './template_selectors/ci_yaml_selector';