summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/gpg_badges.js
diff options
context:
space:
mode:
authorLuke Bennett <lukeeeebennettplus@gmail.com>2018-03-21 18:26:06 +0000
committerLuke Bennett <lukeeeebennettplus@gmail.com>2018-03-21 18:26:06 +0000
commit2bb3e4c6e389915d2702ffcfaff5d31b6a41f582 (patch)
treeda71c857eee52a4f9ac4705ca3f06c9ec7dd9384 /app/assets/javascripts/gpg_badges.js
parent5595afe807c3c11d9c695c558da1210a25544387 (diff)
parent9027d023a58c8ac803bc114c6213b1f124a978a2 (diff)
downloadgitlab-ce-2bb3e4c6e389915d2702ffcfaff5d31b6a41f582.tar.gz
Merge remote-tracking branch 'origin/master' into deprecation-warning-for-dynamic-milestones
Diffstat (limited to 'app/assets/javascripts/gpg_badges.js')
-rw-r--r--app/assets/javascripts/gpg_badges.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/gpg_badges.js b/app/assets/javascripts/gpg_badges.js
index 6bf21f4f27d..502e3569321 100644
--- a/app/assets/javascripts/gpg_badges.js
+++ b/app/assets/javascripts/gpg_badges.js
@@ -1,3 +1,4 @@
+import $ from 'jquery';
import { parseQueryStringIntoObject } from '~/lib/utils/common_utils';
import axios from '~/lib/utils/axios_utils';
import flash from '~/flash';