diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-06-04 19:59:08 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-06-04 19:59:08 +0000 |
| commit | 632427bcc24403be21df5afe8e6bae9cf41c8bc7 (patch) | |
| tree | 2613c2e449bcc36d864520c128b306ee4dd8eb5c | |
| parent | 327cae1da7f91256629fc59cfd4e4c97fd77366a (diff) | |
| parent | 83642acb17c99435e04bc0a9f077cdfe68eee6ff (diff) | |
| download | gitlab-ce-632427bcc24403be21df5afe8e6bae9cf41c8bc7.tar.gz | |
Merge branch '61045-charts-with-many-overlapping-series-display-incorrectly' into 'master'
Resolve "Charts with many overlapping series display incorrectly"
Closes #61045
See merge request gitlab-org/gitlab-ce!29127
| -rw-r--r-- | changelogs/unreleased/61045-charts-with-many-overlapping-series-display-incorrectly.yml | 5 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 8 |
3 files changed, 10 insertions, 5 deletions
diff --git a/changelogs/unreleased/61045-charts-with-many-overlapping-series-display-incorrectly.yml b/changelogs/unreleased/61045-charts-with-many-overlapping-series-display-incorrectly.yml new file mode 100644 index 00000000000..53cc0a15417 --- /dev/null +++ b/changelogs/unreleased/61045-charts-with-many-overlapping-series-display-incorrectly.yml @@ -0,0 +1,5 @@ +--- +title: Eliminate color inconsistencies in metric graphs +merge_request: 29127 +author: +type: fixed diff --git a/package.json b/package.json index f91110efe26..3599ce2c279 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "@babel/preset-env": "^7.4.4", "@gitlab/csslab": "^1.9.0", "@gitlab/svgs": "^1.63.0", - "@gitlab/ui": "^3.10.1", + "@gitlab/ui": "^3.10.3", "apollo-cache-inmemory": "^1.5.1", "apollo-client": "^2.5.1", "apollo-link": "^1.2.11", diff --git a/yarn.lock b/yarn.lock index 155d9910968..6906d6af89f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -698,10 +698,10 @@ resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.63.0.tgz#9dd544026d203e4ce6efed72b05db68f710c4d49" integrity sha512-YztrReFTg31B7v5wtUC5j15KHNcMebtW+kACytEU42XomMaIwk4USIbygqWlq0VRHA2VHJrHApfJHIjxiCCQcA== -"@gitlab/ui@^3.10.1": - version "3.10.1" - resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-3.10.1.tgz#473e1383b05847d7226257228a8fd8d2905a9415" - integrity sha512-LReB+EIBvZlfeEX2s/azuz6NvegrwwzficvBxK5yPCztjDeegcEsTDlt0F32mX6DcvNFacuuAyWN8QtgpaWkhA== +"@gitlab/ui@^3.10.3": + version "3.10.3" + resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-3.10.3.tgz#dba2ddc726e203ab341d870cea2fe634f583c08d" + integrity sha512-Y48DKhOSC+Yw0X8PN+TyR8gITAq6jVHbiTsw+eZkCacs367L1u6w82lr7ba/Bl+4W6DhDWT34VCG0hYbGVrUJw== dependencies: "@babel/standalone" "^7.0.0" "@gitlab/vue-toasted" "^1.2.1" |