summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2019-06-18 15:56:42 +0000
committerMike Greiling <mike@pixelcog.com>2019-06-18 15:56:42 +0000
commitc8f18c50a8e3bf9de66552be46ecd093c65572a7 (patch)
tree32591a630c38a88d63fe8c85a330eaa79043c1d9
parent073a65fe49f00acb5bff061975181c4e389555c2 (diff)
parent5533c0b4469649adce7fe10ec5e21ffddb8f37a9 (diff)
downloadgitlab-ce-63385-empty-iid.tar.gz
Merge branch 'renovate/gitlab-ui-4.x' into 'master'63385-empty-iid
Update dependency @gitlab/ui to ^4.3.0 See merge request gitlab-org/gitlab-ce!29800
-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 ed46b34ef5b..38b07610296 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
"@babel/preset-env": "^7.4.4",
"@gitlab/csslab": "^1.9.0",
"@gitlab/svgs": "^1.65.0",
- "@gitlab/ui": "^4.2.0",
+ "@gitlab/ui": "^4.3.0",
"apollo-cache-inmemory": "^1.5.1",
"apollo-client": "^2.5.1",
"apollo-link": "^1.2.11",
diff --git a/yarn.lock b/yarn.lock
index a6f1a722cfe..2e46217ae50 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -705,10 +705,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.65.0.tgz#48a3a64c0b5524de4e57d51b82a71274af17744d"
integrity sha512-GC9JgVu4/2Ysc3hKFmX6TQV6tqvHZDcfd/DzBzYjy3rHO9qYMZFnw/CKCGa8LkU9F79vfDo3G8NSja7FDXMccw==
-"@gitlab/ui@^4.2.0":
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-4.2.0.tgz#e7fc32b279eaaaf9f0560e431c1af5e467a0ce4c"
- integrity sha512-tOyjjgEECwgVADMtxVetMzn6oRkD0knw7lhDgqP/lIfUTiPuJkVveyhE9z+lqIOvbUs4i65I4q1x84cpDODcYA==
+"@gitlab/ui@^4.3.0":
+ version "4.3.0"
+ resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-4.3.0.tgz#7d6e626e7143febef642a0418ceae1923dfa8f15"
+ integrity sha512-+r19vg9KkFhYO1mlC1Lz98ZnXEifJSumfIUvaRFPgw+LtU2SyOsxXp9fleaJVXXBgpQDiNnpe1FyRL0kWVcn3g==
dependencies:
"@babel/standalone" "^7.0.0"
"@gitlab/vue-toasted" "^1.2.1"