diff options
| author | Jose Vargas <jvargas@gitlab.com> | 2018-09-25 19:22:38 +0300 |
|---|---|---|
| committer | Jose Vargas <jvargas@gitlab.com> | 2018-09-25 19:22:38 +0300 |
| commit | efedd968fb35a1113414885b48798c2723c7578d (patch) | |
| tree | a417e431a24caa67ef2ac56373c3a0f869fefaa4 /app/assets/javascripts/monitoring | |
| parent | d0f81b60e45a0eed8eb863aa9fc9070d1f416f14 (diff) | |
| parent | 45b365b0e5abdb86ff6ac23b00578d5398134af9 (diff) | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into jivl-fix-monitoring-dashboard-resizing-navbar
Diffstat (limited to 'app/assets/javascripts/monitoring')
| -rw-r--r-- | app/assets/javascripts/monitoring/components/dashboard.vue | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/monitoring/components/graph/legend.vue | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue index 524f4d1f568..228eff006f7 100644 --- a/app/assets/javascripts/monitoring/components/dashboard.vue +++ b/app/assets/javascripts/monitoring/components/dashboard.vue @@ -220,8 +220,8 @@ export default { :show-panels="showPanels" > <graph - v-for="(graphData, index) in groupData.metrics" - :key="index" + v-for="(graphData, graphIndex) in groupData.metrics" + :key="graphIndex" :graph-data="graphData" :hover-data="hoverData" :deployment-data="store.deploymentData" diff --git a/app/assets/javascripts/monitoring/components/graph/legend.vue b/app/assets/javascripts/monitoring/components/graph/legend.vue index 3276f3a1ceb..ef18ae5c2c8 100644 --- a/app/assets/javascripts/monitoring/components/graph/legend.vue +++ b/app/assets/javascripts/monitoring/components/graph/legend.vue @@ -58,8 +58,8 @@ export default { </td> <template v-for="(track, trackIndex) in series.tracksLegend"> <track-line - :track="track" - :key="`track-line-${trackIndex}`"/> + :key="`track-line-${trackIndex}`" + :track="track"/> <td :key="`track-info-${trackIndex}`"> <track-info :track="track" |