diff options
| author | Phil Hughes <me@iamphill.com> | 2018-09-24 08:09:43 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-09-24 08:09:43 +0000 |
| commit | 05048e1533ca2511b56e32b76dbb47fc35cf34ce (patch) | |
| tree | 2ddf396995ccf30069bb39be7e58bb90f4e2f947 | |
| parent | 4c8d2232ca3e4b97a313e9ac4d96dee2b3de9e84 (diff) | |
| parent | 744b9a4d8945e36a268e8275cb2fde7dac14d802 (diff) | |
| download | gitlab-ce-05048e1533ca2511b56e32b76dbb47fc35cf34ce.tar.gz | |
Merge branch 'update-gitlab-ui-version' into 'master'
Use gitlab-ui 1.5.1
See merge request gitlab-org/gitlab-ce!21865
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/package.json b/package.json index 4a479b6fb2a..72367a5ae85 100644 --- 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", diff --git a/yarn.lock b/yarn.lock index fe4702f3a78..7ac6c3916b3 100644 --- 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": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-ui/-/gitlab-ui-1.5.0.tgz#320ba164ba8812ff64f94b1cae79a7b749f5bc03" +"@gitlab-org/gitlab-ui@^1.5.1": + version "1.5.1" + 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" |