summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWinnie Hellmann <winnie@gitlab.com>2019-03-25 11:13:22 +0000
committerPhil Hughes <me@iamphill.com>2019-03-25 11:13:22 +0000
commit270d87d0325c31c369aeb803274625e3e877dc53 (patch)
tree5335b1b6b5738d06fc448e03b02d04e3d7a928e6
parentd64452ebfc262cfc1324fcaf116e74bc436413d3 (diff)
downloadgitlab-ce-270d87d0325c31c369aeb803274625e3e877dc53.tar.gz
Revert "Merge branch 'renovate/gitlab-ui-2.x' into 'master'"
This reverts merge request !26380
-rw-r--r--package.json2
-rw-r--r--yarn.lock8
2 files changed, 5 insertions, 5 deletions
diff --git a/package.json b/package.json
index bdb814e1dc4..d830d83b963 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
"@babel/preset-env": "^7.3.1",
"@gitlab/csslab": "^1.8.0",
"@gitlab/svgs": "^1.54.0",
- "@gitlab/ui": "^2.4.1",
+ "@gitlab/ui": "^2.3.0",
"apollo-boost": "^0.3.1",
"apollo-client": "^2.5.1",
"at.js": "^1.5.4",
diff --git a/yarn.lock b/yarn.lock
index c4a6a3ff6b5..15107a64991 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -663,10 +663,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.54.0.tgz#00320e845efd46716042cde0c348b990d4908daf"
integrity sha512-DR17iy8TM5IbXEacqiDP0p8SuC/J8EL+98xbfVz5BKvRsPHpeZJQNlBF/petIV5d+KWM5A9v3GZTY7uMU7z/JQ==
-"@gitlab/ui@^2.4.1":
- version "2.4.1"
- resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-2.4.1.tgz#f2775db7c9a7bc648eaaa2aec3b51a3f0f983339"
- integrity sha512-SC+sRXjbpUzBmyHOuvFgaM0brrX9nUZ241ZFLYb4DvOy6lGMU8IaRTMxtk3V3Ny1+LR2Nai5oXScz7+/YVKdyQ==
+"@gitlab/ui@^2.3.0":
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-2.3.0.tgz#7840aa4ad6638a90e82fa99f3a5dcac1785f7477"
+ integrity sha512-7hH+Q6SeP0hMMM21TQoGmvNjBcadgD+gWlGcKlnN1euH+6kfmOT5TCdrvsUjsZSNdycSXrEMMcQYy2oXG1sbdw==
dependencies:
"@babel/standalone" "^7.0.0"
bootstrap-vue "^2.0.0-rc.11"