From: Grégoire Aubert <gregoire.aubert@sonarsource.com>
Date: Mon, 24 Jul 2017 07:21:22 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/branch-6.5'
X-Git-Tag: 6.6-RC1~844
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1c1b3bb5715b9308185e313effe8a2f91a940433;p=sonarqube.git

Merge remote-tracking branch 'origin/branch-6.5'
---

1c1b3bb5715b9308185e313effe8a2f91a940433
diff --cc server/sonar-web/src/main/js/apps/overview/components/OverviewApp.js
index 79ab68e793c,ad498dbdaf5..a3e7da3c2f3
--- a/server/sonar-web/src/main/js/apps/overview/components/OverviewApp.js
+++ b/server/sonar-web/src/main/js/apps/overview/components/OverviewApp.js
@@@ -32,9 -32,9 +32,10 @@@ import { getMeasuresAndMeta } from '../
  import { getAllTimeMachineData } from '../../../api/time-machine';
  import { enhanceMeasuresWithMetrics } from '../../../helpers/measures';
  import { getLeakPeriod } from '../../../helpers/periods';
++import { TooltipsContainer } from '../../../components/mixins/tooltips-mixin';
  import { getCustomGraph, getGraph } from '../../../helpers/storage';
  import { METRICS, HISTORY_METRICS_LIST } from '../utils';
--import { DEFAULT_GRAPH, getDisplayedHistoryMetrics } from '../../projectActivity/utils';
++import { getDisplayedHistoryMetrics } from '../../projectActivity/utils';
  import type { Component, History, MeasuresList, Period } from '../types';
  import '../styles.css';