summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-12-13 11:09:11 +0000
committerMike Greiling <mike@pixelcog.com>2018-12-13 11:09:11 +0000
commit3821813d1a5f43c1e7dc43347425198b38f1086d (patch)
tree9f3aa5027a31c5cfa1718fa3696eb92e2145e23b
parentfc897f0860103522db9c6c316156064f1c78b01d (diff)
parent402ef3c1649cfb9bebc991b1528ab89702dba91a (diff)
downloadgitlab-ce-3821813d1a5f43c1e7dc43347425198b38f1086d.tar.gz
Merge branch '52774-fix-svgs-in-ie-11' into 'master'
IE11: Fix sprite icon rendering Closes #52774 See merge request gitlab-org/gitlab-ce!23773
-rw-r--r--changelogs/unreleased/52774-fix-svgs-in-ie-11.yml5
-rw-r--r--package.json2
-rw-r--r--yarn.lock8
3 files changed, 10 insertions, 5 deletions
diff --git a/changelogs/unreleased/52774-fix-svgs-in-ie-11.yml b/changelogs/unreleased/52774-fix-svgs-in-ie-11.yml
new file mode 100644
index 00000000000..656a915a281
--- /dev/null
+++ b/changelogs/unreleased/52774-fix-svgs-in-ie-11.yml
@@ -0,0 +1,5 @@
+---
+title: Ensure that SVG sprite icons are properly rendered in IE11
+merge_request:
+author:
+type: fixed
diff --git a/package.json b/package.json
index 8857ed318dd..a04d8268d4f 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
"@babel/plugin-syntax-import-meta": "^7.0.0",
"@babel/preset-env": "^7.1.0",
"@gitlab/csslab": "^1.8.0",
- "@gitlab/svgs": "^1.40.0",
+ "@gitlab/svgs": "^1.42.0",
"@gitlab/ui": "^1.15.0",
"apollo-boost": "^0.1.20",
"apollo-client": "^2.4.5",
diff --git a/yarn.lock b/yarn.lock
index b1273a9fb4a..d93c5864108 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -636,10 +636,10 @@
eslint-plugin-promise "^4.0.1"
eslint-plugin-vue "^5.0.0-beta.3"
-"@gitlab/svgs@^1.40.0":
- version "1.41.0"
- resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.41.0.tgz#f80e3a0e259f3550af00685556ea925e471276d3"
- integrity sha512-tKUXyqe54efWBsjQBUcvNF0AvqmE2NI2No3Bnix/gKDRImzIlcgIkM67Y8zoJv1D0w4CO87WcaG5GLpIFIT1Pg==
+"@gitlab/svgs@^1.42.0":
+ version "1.42.0"
+ resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.42.0.tgz#54eb88606bb79b74373a3aa49d8c10557fb1fd7a"
+ integrity sha512-mVm1kyV/M1fTbQcW8Edbk7BPT2syQf+ot9qwFzLFiFXAn3jXTi6xy+DS+0cgoTnglSUsXVl4qcVAQjt8YoOOOQ==
"@gitlab/ui@^1.15.0":
version "1.15.0"