Merge branch 'ce-to-ee-2018-01-11' of https://gitlab.com/gitlab-org/gitlab-ee...

Merge branch 'ce-to-ee-2018-01-11' of https://gitlab.com/gitlab-org/gitlab-ee into ce-to-ee-2018-01-11

app/assets/javascripts/monitoring/components/dashboard.vue

@@ -55,19 +55,6 @@
       eventHub.$off('toggleAspectRatio', this.toggleAspectRatio);
       eventHub.$off('hoverChanged', this.hoverChanged);
       window.removeEventListener('resize', this.resizeThrottled, false);
-<<<<<<< HEAD
-    },
-
-    mounted() {
-      this.resizeThrottled = _.throttle(this.resize, 600);
-      if (!this.hasMetrics) {
-        this.state = 'gettingStarted';
-      } else {
-        this.getGraphsData();
-        window.addEventListener('resize', this.resizeThrottled, false);
-      }
-=======
->>>>>>> upstream/master
     },
 
     mounted() {

app/assets/javascripts/monitoring/components/graph.vue

@@ -259,12 +259,8 @@
         <svg
           class="graph-data"
           :viewBox="innerViewBox"
-<<<<<<< HEAD
-          ref="graphData">
-=======
           ref="graphData"
         >
->>>>>>> upstream/master
           <graph-path
             v-for="(path, index) in timeSeries"
             :key="index"

app/assets/javascripts/monitoring/components/graph/flag.vue

@@ -5,11 +5,7 @@
 
   export default {
     components: {
-<<<<<<< HEAD
-      Icon,
-=======
       icon,
->>>>>>> upstream/master
     },
     props: {
       currentXCoordinate: {