summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-08-15 07:05:02 +0000
committerBob Van Landuyt <bob@vanlanduyt.co>2018-08-15 13:05:59 +0200
commitf0c3dad06b9fe33d460de4c669f62ca7bd01d78a (patch)
tree3e4b8615ca6eec9462d10f85457550e0b4d875cd
parente392da850b39e5af1f4e086f9e8068769bfc7912 (diff)
downloadgitlab-ce-f0c3dad06b9fe33d460de4c669f62ca7bd01d78a.tar.gz
Merge branch '50281-js-pages-do-not-load-on-windows-8-ie-11' into 'master'
Resolve "JS Pages do not load on windows 8, IE 11" Closes #50281 See merge request gitlab-org/gitlab-ce!21214
-rw-r--r--app/assets/javascripts/commons/polyfills.js1
-rw-r--r--changelogs/unreleased/50281-js-pages-do-not-load-on-windows-8-ie-11.yml5
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/commons/polyfills.js b/app/assets/javascripts/commons/polyfills.js
index 589eeee9695..742cf490ad2 100644
--- a/app/assets/javascripts/commons/polyfills.js
+++ b/app/assets/javascripts/commons/polyfills.js
@@ -8,6 +8,7 @@ import 'core-js/fn/object/assign';
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/string/includes';
import 'core-js/fn/symbol';
import 'core-js/es6/map';
import 'core-js/es6/weak-map';
diff --git a/changelogs/unreleased/50281-js-pages-do-not-load-on-windows-8-ie-11.yml b/changelogs/unreleased/50281-js-pages-do-not-load-on-windows-8-ie-11.yml
new file mode 100644
index 00000000000..eb20e34c466
--- /dev/null
+++ b/changelogs/unreleased/50281-js-pages-do-not-load-on-windows-8-ie-11.yml
@@ -0,0 +1,5 @@
+---
+title: Fix broken JavaScript in IE11
+merge_request: 21214
+author:
+type: fixed