summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2019-06-15 00:52:07 +0000
committerClement Ho <clemmakesapps@gmail.com>2019-06-15 00:52:07 +0000
commitb6f4b2977f61568627707a27f1f4a215f66928db (patch)
tree96a12666b37f46925e5456e7b7f69fc174a3e7b4
parentd7e3fcf1c62089716856e345e2a1b10b61b12c0c (diff)
parentb8eb7a5b13020fdb82c27db25c60bf8c276d6ab5 (diff)
downloadgitlab-ce-b6f4b2977f61568627707a27f1f4a215f66928db.tar.gz
Merge branch 'renovate/gitlab-ui-4.x' into 'master'
Update dependency @gitlab/ui to ^4.1.0 See merge request gitlab-org/gitlab-ce!29707
-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 9770116b5b2..752f9835fcd 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.0.0",
+ "@gitlab/ui": "^4.1.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 5daff8ba49d..0b24bfff95a 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.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-4.0.0.tgz#998a94d4ff91c5baa68d0591763e467a18293081"
- integrity sha512-Z8T3xK3EV1eC2eBmnuO/cvcuLfH5TskGJsc2Hdxar+iUVxACbzs3bfjpFjslVHCCGzSRnewZCoRPO7GJO3miIg==
+"@gitlab/ui@^4.1.0":
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-4.1.0.tgz#bc80ba7846862a336b9f285c42c3fd0f29147c82"
+ integrity sha512-YVIOVtKSjuhQX3ZWA1DBT75Q9rMPvpJIVko5X3yzfRSc9KsPSgVRiOKieDtAviO7LLaeTxMZNzT4J3oY7ejGCw==
dependencies:
"@babel/standalone" "^7.0.0"
"@gitlab/vue-toasted" "^1.2.1"