summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-08-15 07:05:02 +0000
committerTim Zallmann <tzallmann@gitlab.com>2018-08-15 07:05:02 +0000
commit958ea287b5a2abe8a5ddaf9c6e01bea2d5de6590 (patch)
tree85d51b42b8dba461555ec2979eb5cf621e04b6ed
parent92d4da1d31283c491a0fecfa7b1deb902a0d9134 (diff)
parent620fc2808730a9cc1c2b0f532b409cda5fd52460 (diff)
downloadgitlab-ce-958ea287b5a2abe8a5ddaf9c6e01bea2d5de6590.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