summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/commons
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2018-02-03 00:27:59 +0100
committerMatija Čupić <matteeyah@gmail.com>2018-02-03 00:27:59 +0100
commit88c9199abd83a1402c8699d0f9ee63ba5b41c18f (patch)
tree51805b66ebc9a945b98fb36de29502e402b2648b /app/assets/javascripts/commons
parent20714ee90232b5577fc99f2a773ddccf71482c08 (diff)
parenta3166376bb50d84540ba2c60f5f5131ee211ffa8 (diff)
downloadgitlab-ce-persistent-callouts.tar.gz
Merge branch 'master' into persistent-calloutspersistent-callouts
Diffstat (limited to 'app/assets/javascripts/commons')
-rw-r--r--app/assets/javascripts/commons/polyfills.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/commons/polyfills.js b/app/assets/javascripts/commons/polyfills.js
index ff9e4485916..46232726510 100644
--- a/app/assets/javascripts/commons/polyfills.js
+++ b/app/assets/javascripts/commons/polyfills.js
@@ -8,6 +8,8 @@ import 'core-js/fn/promise';
import 'core-js/fn/string/code-point-at';
import 'core-js/fn/string/from-code-point';
import 'core-js/fn/symbol';
+import 'core-js/es6/map';
+import 'core-js/es6/weak-map';
// Browser polyfills
import 'classlist-polyfill';