Commit 489e31d0 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'ee-tz-gitlab-ui-include' into 'master'

EE Port of updated gitlab-ui import for charts

See merge request gitlab-org/gitlab-ee!9371
parents 474f7ef2 29ab6e4e
<script>
import { GlAreaChart } from '@gitlab/ui';
import { GlAreaChart } from '@gitlab/ui/dist/charts';
import dateFormat from 'dateformat';
export default {
......
<script>
import dateFormat from 'dateformat';
import { mapState, mapActions } from 'vuex';
import { GlChart } from '@gitlab/ui';
import { GlChart } from '@gitlab/ui/dist/charts';
import ChartTooltip from './vulnerability_chart_tooltip.vue';
export default {
......
......@@ -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"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment