summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-03-25 15:33:18 +0000
committerPhil Hughes <me@iamphill.com>2019-03-25 15:33:18 +0000
commit80a65cb85f489485ee5445ecd4327f0abbc5bf0b (patch)
treedfe43211905ef5dbd06cd0c59b1ca487d4aa9638
parent192861d78b6b61671e0505ddc62231cbc5c3ec3f (diff)
parent1c8cf93ac7372c00085f640d4b4632fac6fb05be (diff)
downloadgitlab-ce-80a65cb85f489485ee5445ecd4327f0abbc5bf0b.tar.gz
Merge branch 'ce-mw-update-gl-search-box' into 'master'
(CE port) Replace GlSearchBox with GlSearchBoxByType Closes gitlab-ee#10637 See merge request gitlab-org/gitlab-ce!26548
-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 d830d83b963..1154d57cad2 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.3.0",
+ "@gitlab/ui": "^3.0.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 15107a64991..7123650b003 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.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==
+"@gitlab/ui@^3.0.0":
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-3.0.0.tgz#33ca2808dbd4395e69a366a219d1edc1f3dbccd5"
+ integrity sha512-pDEa2k6ln5GE/N2z0V7dNEeFtSTW0p9ipO2/N9q6QMxO7fhhOhpMC0QVbdIljKTbglspDWI5v6BcqUjzYri5Pg==
dependencies:
"@babel/standalone" "^7.0.0"
bootstrap-vue "^2.0.0-rc.11"