Merge branch 'update-gitlab-ui-version' into 'master'

Use gitlab-ui 1.5.1 See merge request gitlab-org/gitlab-ce!21865

Merge branch 'update-gitlab-ui-version' into 'master'
Use gitlab-ui 1.5.1 See merge request gitlab-org/gitlab-ce!21865
05048e15 · Phil Hughes · 4c8d2232 · 744b9a4d · 05048e15 · 05048e15
Commit 05048e15 authored Sep 24, 2018 by Phil Hughes
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

package.json package.json +1 -1

yarn.lock yarn.lock +3 -3

No files found.
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
  },
  "dependencies": {
    "@gitlab-org/gitlab-svgs": "^1.29.0",
-    "@gitlab-org/gitlab-ui": "^1.5.0",
+    "@gitlab-org/gitlab-ui": "^1.5.1",
    "autosize": "^4.0.0",
    "axios": "^0.17.1",
    "babel-core": "^6.26.3",

--- a/yarn.lock
+++ b/yarn.lock
@@ -82,9 +82,9 @@
  version "1.29.0"
  resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.29.0.tgz#03b65b513f9099bbda6ecf94d673a2952f8c6c70"
-"@gitlab-org/gitlab-ui@^1.5.0":
+"@gitlab-org/gitlab-ui@^1.5.1":
-  version "1.5.0"
+  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-ui/-/gitlab-ui-1.5.0.tgz#320ba164ba8812ff64f94b1cae79a7b749f5bc03"
+  resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-ui/-/gitlab-ui-1.5.1.tgz#82bc8583e24edfbaab5f1b6e88bf1a8056d7b528"
  dependencies:
    "@gitlab-org/gitlab-svgs" "^1.23.0"
    bootstrap-vue "^2.0.0-rc.11"