diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-10-30 21:17:25 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-10-30 21:17:25 +0000 |
| commit | 0f62aeb405f7d5526b2403a97cbce77eb4e19b6b (patch) | |
| tree | e47cf7dbbe186cc8efb342cdef9f8c4b042d959b | |
| parent | 571e651b21c7a618b8686a4b3f8a8c09c87a37f5 (diff) | |
| parent | 48addd938d021a8bac5f121362673ed7fec5cb0c (diff) | |
| download | gitlab-ce-0f62aeb405f7d5526b2403a97cbce77eb4e19b6b.tar.gz | |
Merge branch '53052-mg-fix-broken-ie11' into 'master'
Fix broken ie11 due to non-transpiled components in gitlab-ui
Closes #53052
See merge request gitlab-org/gitlab-ce!22695
| -rw-r--r-- | changelogs/unreleased/53052-mg-fix-broken-ie11.yml | 5 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 8 |
3 files changed, 10 insertions, 5 deletions
diff --git a/changelogs/unreleased/53052-mg-fix-broken-ie11.yml b/changelogs/unreleased/53052-mg-fix-broken-ie11.yml new file mode 100644 index 00000000000..c616efffa6b --- /dev/null +++ b/changelogs/unreleased/53052-mg-fix-broken-ie11.yml @@ -0,0 +1,5 @@ +--- +title: Fix incompatibility with IE11 due to non-transpiled gitlab-ui components +merge_request: 22695 +author: +type: fixed diff --git a/package.json b/package.json index d418147b92b..608d4e58dd3 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "@babel/plugin-syntax-import-meta": "^7.0.0", "@babel/preset-env": "^7.1.0", "@gitlab-org/gitlab-svgs": "^1.33.0", - "@gitlab-org/gitlab-ui": "^1.9.0", + "@gitlab-org/gitlab-ui": "^1.10.0", "autosize": "^4.0.0", "axios": "^0.17.1", "babel-loader": "^8.0.4", diff --git a/yarn.lock b/yarn.lock index 79f1b757252..0124ee0572d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -626,10 +626,10 @@ resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.33.0.tgz#068566e8ee00795f6f09f58236f08e1716f9f04a" integrity sha512-8ajtUHk6gQ1xosL/CO5IzHSFM/t18hx5pfzQ3cd0VuQXcyR6QKGuXTLwbYdmJDYOw1Etoo5DqDWxPEClHyZpiA== -"@gitlab-org/gitlab-ui@^1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-ui/-/gitlab-ui-1.9.0.tgz#c47851587316f60926e8304747d1fcdd1222c779" - integrity sha512-OQ/mhWnbeG4pmjnCGwLsyvmHDYdLh2IRnt4Jx6G9jf96oyjEHzY1rveImfqcQ2bvx9azfuI6CU9dmDSY3aWvvQ== +"@gitlab-org/gitlab-ui@^1.10.0": + version "1.10.0" + resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-ui/-/gitlab-ui-1.10.0.tgz#3ac54ecaa25ea558324f0b382c97fcf9e3c4f0a5" + integrity sha512-kfoCKA+AmWZ3hf1wOS8W9mPJs/7lF+a01PK//+sw2MOLv6PlduJJmdN8drFuJ65o6cTJ1f9FMVB80R6D71XVKQ== dependencies: "@gitlab-org/gitlab-svgs" "^1.23.0" bootstrap-vue "^2.0.0-rc.11" |