diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-09-11 20:55:36 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-09-11 20:55:36 +0000 |
| commit | 9b0764938315dd581cf38d8589f6811dc63b26a8 (patch) | |
| tree | 87fe69e4eb2d51c0e845099c30975f6d00eedad2 | |
| parent | 67f3bf3af8a3f178f07fe7f08b3eea59f3db865b (diff) | |
| parent | 8ee157eb4d7c792419ab99106c72cc46ef6dbb50 (diff) | |
| download | gitlab-ce-9b0764938315dd581cf38d8589f6811dc63b26a8.tar.gz | |
Merge branch 'use-bootstrap-4.1.1' into 'master'
Explicitly use bootstrap 4.1.1
Closes #51362
See merge request gitlab-org/gitlab-ce!21683
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/package.json b/package.json index f7b5e84548b..1d69a9feb33 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "babel-preset-latest": "^6.24.1", "babel-preset-stage-2": "^6.24.1", "blackst0ne-mermaid": "^7.1.0-fixed", - "bootstrap": "~4.1.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 97aef77cb56..57ec6096549 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1268,9 +1268,13 @@ bootstrap-vue@^2.0.0-rc.11: popper.js "^1.12.9" vue-functional-data-merge "^2.0.5" -bootstrap@^4.1.1, bootstrap@~4.1.1: - version "4.1.2" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.2.tgz#aee2a93472e61c471fc79fb475531dcbc87de326" +bootstrap@4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.1.tgz#3aec85000fa619085da8d2e4983dfd67cf2114cb" + +bootstrap@^4.1.1: + version "4.1.3" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.3.tgz#0eb371af2c8448e8c210411d0cb824a6409a12be" boxen@^1.2.1: version "1.3.0" |