diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-17 09:08:41 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-17 09:08:41 +0300 |
| commit | 86aa26275ff06d03af35feb855fca519aac9bef1 (patch) | |
| tree | b997061ca7deeb7f908cbaa0dd978f4f5124395a | |
| parent | 700068dda89eeb10272ae352a2a1e5144055f51b (diff) | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | spec/frontend/vue_shared/components/__snapshots__/memory_graph_spec.js.snap | 1 | ||||
| -rw-r--r-- | yarn.lock | 8 |
3 files changed, 6 insertions, 5 deletions
diff --git a/package.json b/package.json index 5cae779ac08..9142f766e6c 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "@gitlab/favicon-overlay": "2.0.0", "@gitlab/fonts": "^1.0.1", "@gitlab/svgs": "3.13.0", - "@gitlab/ui": "52.3.0", + "@gitlab/ui": "52.5.0", "@gitlab/visual-review-tools": "1.7.3", "@gitlab/web-ide": "0.0.1-dev-20221216140656", "@rails/actioncable": "6.1.4-7", diff --git a/spec/frontend/vue_shared/components/__snapshots__/memory_graph_spec.js.snap b/spec/frontend/vue_shared/components/__snapshots__/memory_graph_spec.js.snap index 87eaabf4e98..b7b43264330 100644 --- a/spec/frontend/vue_shared/components/__snapshots__/memory_graph_spec.js.snap +++ b/spec/frontend/vue_shared/components/__snapshots__/memory_graph_spec.js.snap @@ -7,6 +7,7 @@ exports[`MemoryGraph Render chart should draw container with chart 1`] = ` > <gl-sparkline-chart-stub data="Nov 12 2019 19:17:33,2.87,Nov 12 2019 19:18:33,2.78,Nov 12 2019 19:19:33,2.78,Nov 12 2019 19:20:33,3.01" + gradient="" height="25" tooltiplabel="MB" /> diff --git a/yarn.lock b/yarn.lock index afb3ae42a29..48ecf6de2f4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1136,10 +1136,10 @@ resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-3.13.0.tgz#2d62286c956bd49ba7156b2aa4eed79507baca53" integrity sha512-Yv4dZ4pOyUVMCZXNxLuMinZ/x8E6+g8/yM1z/2ERT0t7hSAC3bCUHn2OEFpujtYzFtwMZXMFPQFEJJipQ1I/+w== -"@gitlab/ui@52.3.0": - version "52.3.0" - resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-52.3.0.tgz#8495b86dceecdf150f9c4a577353791b61f1a3fd" - integrity sha512-vYjHt61MQTiMh1eP72+iSABdg8DhbKk+cZBkjg79ACwJjh9zsJl7DVBFNWF37FS+21/errepTybQzxGbzOvwxA== +"@gitlab/ui@52.5.0": + version "52.5.0" + resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-52.5.0.tgz#38ccc5bff39be7659944799922a8ec7435d6ddd5" + integrity sha512-PpuP1MwlbIZPf3ugj0icf41wSjWgBAmLJtnSN/aHx5qyjO1D8jwtY3a4KZlS2Prs097P7biDJY+2fYtDP8h8Mg== dependencies: "@popperjs/core" "^2.11.2" bootstrap-vue "2.20.1" |