diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2018-02-04 23:38:59 +0100 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2018-02-04 23:38:59 +0100 |
| commit | 3366f377c1d4cbb02ecc5a2e47b059ed375c5e09 (patch) | |
| tree | 6a19813b4820ad6d2813bf86b30d8e5be2bd10c6 /app/assets/javascripts/commons/polyfills.js | |
| parent | 0abce36cd20cdd3579138bee835d28519a5593f2 (diff) | |
| parent | cf887a8b3108edb715ee5618377f4ffab1824d85 (diff) | |
| download | gitlab-ce-3366f377c1d4cbb02ecc5a2e47b059ed375c5e09.tar.gz | |
Merge branch 'master' into 38265-stuckcijobsworker-wrongly-detects-cancels-stuck-builds-when-per-job-timeout-is-more-than-an-hour
Diffstat (limited to 'app/assets/javascripts/commons/polyfills.js')
| -rw-r--r-- | app/assets/javascripts/commons/polyfills.js | 2 |
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'; |