diff options
| author | Phil Hughes <me@iamphill.com> | 2019-02-04 17:55:18 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-02-04 17:55:18 +0000 |
| commit | ad513afc3f9efb81ef40ff5f5fa8c4d21f063ce1 (patch) | |
| tree | e8ae19d78ee9fd600cfb72525c0d4d64a4a5db99 | |
| parent | 7ffbfeb1f79b18b6a3a42e73d12b9680e3e3eb48 (diff) | |
| parent | 65088f4c6f1ede16c6a296578354b941129a72b6 (diff) | |
| download | gitlab-ce-ad513afc3f9efb81ef40ff5f5fa8c4d21f063ce1.tar.gz | |
Merge branch 'tz-gitlab-ui-include' into 'master'
gitlab-ui update with the new charting setup
Closes #56987
See merge request gitlab-org/gitlab-ce!24807
| -rw-r--r-- | app/assets/javascripts/monitoring/components/charts/area.vue | 2 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/monitoring/components/charts/area.vue b/app/assets/javascripts/monitoring/components/charts/area.vue index 5ca561259b6..553a6ef4d8a 100644 --- a/app/assets/javascripts/monitoring/components/charts/area.vue +++ b/app/assets/javascripts/monitoring/components/charts/area.vue @@ -1,5 +1,5 @@ <script> -import { GlAreaChart } from '@gitlab/ui'; +import { GlAreaChart } from '@gitlab/ui/dist/charts'; import dateFormat from 'dateformat'; export default { diff --git a/package.json b/package.json index 4d884470cc4..3f504dc0b0b 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "@babel/preset-env": "^7.3.1", "@gitlab/csslab": "^1.8.0", "@gitlab/svgs": "^1.48.0", - "@gitlab/ui": "^1.22.1", + "@gitlab/ui": "^2.0.0", "apollo-boost": "^0.1.20", "apollo-client": "^2.4.5", "autosize": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index a33d3a13e47..a55bd26ffd4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -658,10 +658,10 @@ resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.48.0.tgz#7b2e20e357d85aa46e905e6ca51b0b4184ae2794" integrity sha512-9lRsfqN0W3JxopiXnTzvDY31O465jMTGNKpiOCXy7uAMfwZA6UsRsc7Pp369uKnOLR0duXUGOxOv4NGsK6AeXw== -"@gitlab/ui@^1.22.1": - version "1.22.1" - resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-1.22.1.tgz#92ed77216c5702776049b9ac41eb717c1acd864e" - integrity sha512-pWbEaXOOcp8Xt2TjJtPas3lXwWVvizrBOf0M8yN0XAn2GgIRCVnRMpjNEN7/oNeBcEM9CrmPYApEM/hZO+maqQ== +"@gitlab/ui@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-2.0.0.tgz#96c6845292a037de8b38bec9958e051b9904e52e" + integrity sha512-TnM+Wf5/0eRxtB02Hblfqx1X6INP+uhRcLoW+nv7Xy0fyy3LIU81EVaCnDEKFddhoK04DzmlUXswRIu59iI5LQ== dependencies: babel-standalone "^6.26.0" bootstrap-vue "^2.0.0-rc.11" |