diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-05-28 16:15:40 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-05-28 16:15:40 +0000 |
| commit | 57838e331c75aeab08a89d23c22f54a074477519 (patch) | |
| tree | d2d81681a1c757f8377da9d47e7ee0d8c861e219 | |
| parent | 65bfec654a1ff2894e7829573d266f8d63c846f2 (diff) | |
| parent | c404497773e5ea1c2d59630147637fe86628dc03 (diff) | |
| download | gitlab-ce-57838e331c75aeab08a89d23c22f54a074477519.tar.gz | |
Merge branch 'leipert-forward-bootstrap4' into 'master'
Update bootstrap to 4.1.1
See merge request gitlab-org/gitlab-ce!19179
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/package.json b/package.json index 13be495b702..defcbd34d95 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "babel-preset-latest": "^6.24.1", "babel-preset-stage-2": "^6.24.1", "blackst0ne-mermaid": "^7.1.0-fixed", - "bootstrap": "4.1", + "bootstrap": "~4.1.1", "brace-expansion": "^1.1.8", "cache-loader": "^1.2.2", "chart.js": "1.0.2", diff --git a/yarn.lock b/yarn.lock index 4925fa8f373..b5ff26c4016 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1274,9 +1274,9 @@ boom@5.x.x: dependencies: hoek "4.x.x" -bootstrap@4.1: - version "4.1.0" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.0.tgz#110b05c31a236d56dbc9adcda6dd16f53738a28a" +bootstrap@~4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.1.tgz#3aec85000fa619085da8d2e4983dfd67cf2114cb" boxen@^1.2.1: version "1.3.0" |