Merge branch 'ce-to-ee-2018-03-28' into 'master'

CE upstream - 2018-03-28 12:06 UTC Closes #5461 See merge request gitlab-org/gitlab-ee!5145

Merge branch 'ce-to-ee-2018-03-28' into 'master'
CE upstream - 2018-03-28 12:06 UTC Closes #5461 See merge request gitlab-org/gitlab-ee!5145
766a3e85 · Sean McGivern · 60e7308e · bdc72a02 · 766a3e85 · 766a3e85
Commit 766a3e85 authored Mar 29, 2018 by Sean McGivern
48 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -51,6 +51,7 @@ eslint-report.html
 /db/data.yml
 /doc/code/*
 /dump.rdb
+/jsconfig.json
 /log/*.log*
 /node_modules/
 /nohup.out

--- a/Gemfile
+++ b/Gemfile
@@ -156,8 +156,8 @@ gem 'rdoc', '~> 4.2'
 gem 'org-ruby', '~> 0.9.12'
 gem 'creole', '~> 0.5.0'
 gem 'wikicloth', '0.8.1'
-gem 'asciidoctor', '~> 1.5.2'
+gem 'asciidoctor', '~> 1.5.6'
-gem 'asciidoctor-plantuml', '0.0.7'
+gem 'asciidoctor-plantuml', '0.0.8'
 gem 'rouge', '~> 2.0'
 gem 'truncato', '~> 0.7.9'
 gem 'bootstrap_form', '~> 2.7.0'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -56,8 +56,8 @@ GEM
      faraday_middleware (~> 0.9)
      faraday_middleware-multi_json (~> 0.0)
      oauth2 (~> 1.0)
-    asciidoctor (1.5.3)
+    asciidoctor (1.5.6.2)
-    asciidoctor-plantuml (0.0.7)
+    asciidoctor-plantuml (0.0.8)
      asciidoctor (~> 1.5)
    asset_sync (2.2.0)
      activemodel (>= 4.1.0)
@@ -1028,8 +1028,8 @@ DEPENDENCIES
  akismet (~> 2.0)
  allocations (~> 1.0)
  asana (~> 0.6.0)
-  asciidoctor (~> 1.5.2)
+  asciidoctor (~> 1.5.6)
-  asciidoctor-plantuml (= 0.0.7)
+  asciidoctor-plantuml (= 0.0.8)
  asset_sync (~> 2.2.0)
  attr_encrypted (~> 3.0.0)
  awesome_print (~> 1.2.0)

--- a/app/assets/javascripts/gl_dropdown.js
+++ b/app/assets/javascripts/gl_dropdown.js
@@ -757,7 +757,7 @@ GitLabDropdown = (function() {
    }
    if (this.options.isSelectable && !this.options.isSelectable(selectedObject, el)) {
-      return;
+      return [selectedObject];
    }
    if (el.hasClass(ACTIVE_CLASS) && value !== 0) {

--- a/app/assets/javascripts/ide/lib/editor_options.js
+++ b/app/assets/javascripts/ide/lib/editor_options.js
@@ -6,6 +6,7 @@ export const defaultEditorOptions = {
  minimap: {
    enabled: false,
  },
+  wordWrap: 'bounded',
 };
 export default [

--- a/app/assets/javascripts/monitoring/components/dashboard.vue
+++ b/app/assets/javascripts/monitoring/components/dashboard.vue
 <script>
-  import _ from 'underscore';
+import _ from 'underscore';
-  import Flash from '../../flash';
+import Flash from '../../flash';
-  import MonitoringService from '../services/monitoring_service';
+import MonitoringService from '../services/monitoring_service';
-  import GraphGroup from './graph_group.vue';
+import GraphGroup from './graph_group.vue';
-  import Graph from './graph.vue';
+import Graph from './graph.vue';
-  import EmptyState from './empty_state.vue';
+import EmptyState from './empty_state.vue';
-  import MonitoringStore from '../stores/monitoring_store';
+import MonitoringStore from '../stores/monitoring_store';
-  import eventHub from '../event_hub';
+import eventHub from '../event_hub';
-  export default {
+export default {
-    components: {
+  components: {
-      Graph,
+    Graph,
-      GraphGroup,
+    GraphGroup,
-      EmptyState,
+    EmptyState,
+  },
+  props: {
+    hasMetrics: {
+      type: Boolean,
+      required: false,
+      default: true,
    },
+    showLegend: {
-    props: {
+      type: Boolean,
-      hasMetrics: {
+      required: false,
-        type: Boolean,
+      default: true,
-        required: false,
-        default: true,
-      },
-      showLegend: {
-        type: Boolean,
-        required: false,
-        default: true,
-      },
-      showPanels: {
-        type: Boolean,
-        required: false,
-        default: true,
-      },
-      forceSmallGraph: {
-        type: Boolean,
-        required: false,
-        default: false,
-      },
-      documentationPath: {
-        type: String,
-        required: true,
-      },
-      settingsPath: {
-        type: String,
-        required: true,
-      },
-      clustersPath: {
-        type: String,
-        required: true,
-      },
-      tagsPath: {
-        type: String,
-        required: true,
-      },
-      projectPath: {
-        type: String,
-        required: true,
-      },
-      metricsEndpoint: {
-        type: String,
-        required: true,
-      },
-      deploymentEndpoint: {
-        type: String,
-        required: false,
-        default: null,
-      },
-      emptyGettingStartedSvgPath: {
-        type: String,
-        required: true,
-      },
-      emptyLoadingSvgPath: {
-        type: String,
-        required: true,
-      },
-      emptyNoDataSvgPath: {
-        type: String,
-        required: true,
-      },
-      emptyUnableToConnectSvgPath: {
-        type: String,
-        required: true,
-      },
    },
+    showPanels: {
-    data() {
+      type: Boolean,
-      return {
+      required: false,
-        store: new MonitoringStore(),
+      default: true,
-        state: 'gettingStarted',
-        showEmptyState: true,
-        updateAspectRatio: false,
-        updatedAspectRatios: 0,
-        hoverData: {},
-        resizeThrottled: {},
-      };
    },
+    forceSmallGraph: {
-    created() {
+      type: Boolean,
-      this.service = new MonitoringService({
+      required: false,
-        metricsEndpoint: this.metricsEndpoint,
+      default: false,
-        deploymentEndpoint: this.deploymentEndpoint,
-      });
-      eventHub.$on('toggleAspectRatio', this.toggleAspectRatio);
-      eventHub.$on('hoverChanged', this.hoverChanged);
    },
+    documentationPath: {
-    beforeDestroy() {
+      type: String,
-      eventHub.$off('toggleAspectRatio', this.toggleAspectRatio);
+      required: true,
-      eventHub.$off('hoverChanged', this.hoverChanged);
-      window.removeEventListener('resize', this.resizeThrottled, false);
    },
+    settingsPath: {
-    mounted() {
+      type: String,
-      this.resizeThrottled = _.throttle(this.resize, 600);
+      required: true,
-      if (!this.hasMetrics) {
+    },
-        this.state = 'gettingStarted';
+    clustersPath: {
-      } else {
+      type: String,
-        this.getGraphsData();
+      required: true,
-        window.addEventListener('resize', this.resizeThrottled, false);
+    },
+    tagsPath: {
+      type: String,
+      required: true,
+    },
+    projectPath: {
+      type: String,
+      required: true,
+    },
+    metricsEndpoint: {
+      type: String,
+      required: true,
+    },
+    deploymentEndpoint: {
+      type: String,
+      required: false,
+      default: null,
+    },
+    emptyGettingStartedSvgPath: {
+      type: String,
+      required: true,
+    },
+    emptyLoadingSvgPath: {
+      type: String,
+      required: true,
+    },
+    emptyNoDataSvgPath: {
+      type: String,
+      required: true,
+    },
+    emptyUnableToConnectSvgPath: {
+      type: String,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      store: new MonitoringStore(),
+      state: 'gettingStarted',
+      showEmptyState: true,
+      updateAspectRatio: false,
+      updatedAspectRatios: 0,
+      hoverData: {},
+      resizeThrottled: {},
+    };
+  },
+  created() {
+    this.service = new MonitoringService({
+      metricsEndpoint: this.metricsEndpoint,
+      deploymentEndpoint: this.deploymentEndpoint,
+    });
+    eventHub.$on('toggleAspectRatio', this.toggleAspectRatio);
+    eventHub.$on('hoverChanged', this.hoverChanged);
+  },
+  beforeDestroy() {
+    eventHub.$off('toggleAspectRatio', this.toggleAspectRatio);
+    eventHub.$off('hoverChanged', this.hoverChanged);
+    window.removeEventListener('resize', this.resizeThrottled, false);
+  },
+  mounted() {
+    this.resizeThrottled = _.throttle(this.resize, 600);
+    if (!this.hasMetrics) {
+      this.state = 'gettingStarted';
+    } else {
+      this.getGraphsData();
+      window.addEventListener('resize', this.resizeThrottled, false);
+    }
+  },
+  methods: {
+    getGraphsData() {
+      this.state = 'loading';
+      Promise.all([
+        this.service.getGraphsData().then(data => this.store.storeMetrics(data)),
+        this.service
+          .getDeploymentData()
+          .then(data => this.store.storeDeploymentData(data))
+          .catch(() => new Flash('Error getting deployment information.')),
+      ])
+        .then(() => {
+          if (this.store.groups.length < 1) {
+            this.state = 'noData';
+            return;
+          }
+          this.showEmptyState = false;
+        })
+        .catch(() => {
+          this.state = 'unableToConnect';
+        });
+    },
+    resize() {
+      this.updateAspectRatio = true;
+    },
+    toggleAspectRatio() {
+      this.updatedAspectRatios = this.updatedAspectRatios += 1;
+      if (this.store.getMetricsCount() === this.updatedAspectRatios) {
+        this.updateAspectRatio = !this.updateAspectRatio;
+        this.updatedAspectRatios = 0;
      }
    },
+    hoverChanged(data) {
-    methods: {
+      this.hoverData = data;
-      getGraphsData() {
-        this.state = 'loading';
-        Promise.all([
-          this.service.getGraphsData()
-            .then(data => this.store.storeMetrics(data)),
-          this.service.getDeploymentData()
-            .then(data => this.store.storeDeploymentData(data))
-            .catch(() => new Flash('Error getting deployment information.')),
-        ])
-          .then(() => {
-            if (this.store.groups.length < 1) {
-              this.state = 'noData';
-              return;
-            }
-            this.showEmptyState = false;
-          })
-          .catch(() => { this.state = 'unableToConnect'; });
-      },
-      resize() {
-        this.updateAspectRatio = true;
-      },
-      toggleAspectRatio() {
-        this.updatedAspectRatios = this.updatedAspectRatios += 1;
-        if (this.store.getMetricsCount() === this.updatedAspectRatios) {
-          this.updateAspectRatio = !this.updateAspectRatio;
-          this.updatedAspectRatios = 0;
-        }
-      },
-      hoverChanged(data) {
-        this.hoverData = data;
-      },
    },
-  };
+  },
+};
 </script>
 <template>

--- a/app/assets/javascripts/monitoring/components/empty_state.vue
+++ b/app/assets/javascripts/monitoring/components/empty_state.vue
 <script>
-  export default {
+export default {
-    props: {
+  props: {
-      documentationPath: {
+    documentationPath: {
-        type: String,
+      type: String,
-        required: true,
+      required: true,
-      },
+    },
-      settingsPath: {
+    settingsPath: {
-        type: String,
+      type: String,
-        required: false,
+      required: false,
-        default: '',
+      default: '',
-      },
+    },
-      clustersPath: {
+    clustersPath: {
-        type: String,
+      type: String,
-        required: false,
+      required: false,
-        default: '',
+      default: '',
-      },
+    },
-      selectedState: {
+    selectedState: {
-        type: String,
+      type: String,
-        required: true,
+      required: true,
-      },
-      emptyGettingStartedSvgPath: {
-        type: String,
-        required: true,
-      },
-      emptyLoadingSvgPath: {
-        type: String,
-        required: true,
-      },
-      emptyNoDataSvgPath: {
-        type: String,
-        required: true,
-      },
-      emptyUnableToConnectSvgPath: {
-        type: String,
-        required: true,
-      },
    },
-    data() {
+    emptyGettingStartedSvgPath: {
-      return {
+      type: String,
-        states: {
+      required: true,
-          gettingStarted: {
+    },
-            svgUrl: this.emptyGettingStartedSvgPath,
+    emptyLoadingSvgPath: {
-            title: 'Get started with performance monitoring',
+      type: String,
-            description: `Stay updated about the performance and health
+      required: true,
+    },
+    emptyNoDataSvgPath: {
+      type: String,
+      required: true,
+    },
+    emptyUnableToConnectSvgPath: {
+      type: String,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      states: {
+        gettingStarted: {
+          svgUrl: this.emptyGettingStartedSvgPath,
+          title: 'Get started with performance monitoring',
+          description: `Stay updated about the performance and health
              of your environment by configuring Prometheus to monitor your deployments.`,
-            buttonText: 'Install Prometheus on clusters',
+          buttonText: 'Install Prometheus on clusters',
-            buttonPath: this.clustersPath,
+          buttonPath: this.clustersPath,
-            secondaryButtonText: 'Configure existing Prometheus',
+          secondaryButtonText: 'Configure existing Prometheus',
-            secondaryButtonPath: this.settingsPath,
+          secondaryButtonPath: this.settingsPath,
-          },
+        },
-          loading: {
+        loading: {
-            svgUrl: this.emptyLoadingSvgPath,
+          svgUrl: this.emptyLoadingSvgPath,
-            title: 'Waiting for performance data',
+          title: 'Waiting for performance data',
-            description: `Creating graphs uses the data from the Prometheus server.
+          description: `Creating graphs uses the data from the Prometheus server.
              If this takes a long time, ensure that data is available.`,
-            buttonText: 'View documentation',
+          buttonText: 'View documentation',
-            buttonPath: this.documentationPath,
+          buttonPath: this.documentationPath,
-          },
+        },
-          noData: {
+        noData: {
-            svgUrl: this.emptyNoDataSvgPath,
+          svgUrl: this.emptyNoDataSvgPath,
-            title: 'No data found',
+          title: 'No data found',
-            description: `You are connected to the Prometheus server, but there is currently
+          description: `You are connected to the Prometheus server, but there is currently
              no data to display.`,
-            buttonText: 'Configure Prometheus',
+          buttonText: 'Configure Prometheus',
-            buttonPath: this.settingsPath,
+          buttonPath: this.settingsPath,
-          },
+        },
-          unableToConnect: {
+        unableToConnect: {
-            svgUrl: this.emptyUnableToConnectSvgPath,
+          svgUrl: this.emptyUnableToConnectSvgPath,
-            title: 'Unable to connect to Prometheus server',
+          title: 'Unable to connect to Prometheus server',
-            description: 'Ensure connectivity is available from the GitLab server to the ',
+          description: 'Ensure connectivity is available from the GitLab server to the ',
-            buttonText: 'View documentation',
+          buttonText: 'View documentation',
-            buttonPath: this.documentationPath,
+          buttonPath: this.documentationPath,
-          },
        },
-      };
-    },
-    computed: {
-      currentState() {
-        return this.states[this.selectedState];
-      },
-      showButtonDescription() {
-        if (this.selectedState === 'unableToConnect') return true;
-        return false;
      },
+    };
+  },
+  computed: {
+    currentState() {
+      return this.states[this.selectedState];
+    },
+    showButtonDescription() {
+      if (this.selectedState === 'unableToConnect') return true;
+      return false;
    },
-  };
+  },
+};
 </script>
 <template>

--- a/app/assets/javascripts/monitoring/components/graph.vue
+++ b/app/assets/javascripts/monitoring/components/graph.vue
--- a/app/assets/javascripts/monitoring/components/graph/deployment.vue
+++ b/app/assets/javascripts/monitoring/components/graph/deployment.vue
 <script>
-  export default {
+export default {
-    props: {
+  props: {
-      deploymentData: {
+    deploymentData: {
-        type: Array,
+      type: Array,
-        required: true,
+      required: true,
-      },
-      graphHeight: {
-        type: Number,
-        required: true,
-      },
-      graphHeightOffset: {
-        type: Number,
-        required: true,
-      },
    },
+    graphHeight: {
-    computed: {
+      type: Number,
-      calculatedHeight() {
+      required: true,
-        return this.graphHeight - this.graphHeightOffset;
-      },
    },
+    graphHeightOffset: {
-    methods: {
+      type: Number,
-      transformDeploymentGroup(deployment) {
+      required: true,
-        return `translate(${Math.floor(deployment.xPos) - 5}, 20)`;
-      },
    },
-  };
+  },
+  computed: {
+    calculatedHeight() {
+      return this.graphHeight - this.graphHeightOffset;
+    },
+  },
+  methods: {
+    transformDeploymentGroup(deployment) {
+      return `translate(${Math.floor(deployment.xPos) - 5}, 20)`;
+    },
+  },
+};
 </script>
 <template>
  <g class="deploy-info">

--- a/app/assets/javascripts/monitoring/components/graph/flag.vue
+++ b/app/assets/javascripts/monitoring/components/graph/flag.vue
 <script>
-  import { dateFormat, timeFormat } from '../../utils/date_time_formatters';
+import { dateFormat, timeFormat } from '../../utils/date_time_formatters';
-  import { formatRelevantDigits } from '../../../lib/utils/number_utils';
+import { formatRelevantDigits } from '../../../lib/utils/number_utils';
-  import icon from '../../../vue_shared/components/icon.vue';
+import icon from '../../../vue_shared/components/icon.vue';
-  export default {
+export default {
-    components: {
+  components: {
-      icon,
+    icon,
-    },
+  },
-    props: {
+  props: {
-      currentXCoordinate: {
+    currentXCoordinate: {
-        type: Number,
+      type: Number,
-        required: true,
+      required: true,
-      },
-      currentData: {
-        type: Object,
-        required: true,
-      },
-      deploymentFlagData: {
-        type: Object,
-        required: false,
-        default: null,
-      },
-      graphHeight: {
-        type: Number,
-        required: true,
-      },
-      graphHeightOffset: {
-        type: Number,
-        required: true,
-      },
-      realPixelRatio: {
-        type: Number,
-        required: true,
-      },
-      showFlagContent: {
-        type: Boolean,
-        required: true,
-      },
-      timeSeries: {
-        type: Array,
-        required: true,
-      },
-      unitOfDisplay: {
-        type: String,
-        required: true,
-      },
-      currentDataIndex: {
-        type: Number,
-        required: true,
-      },
-      legendTitle: {
-        type: String,
-        required: true,
-      },
    },
+    currentData: {
-    computed: {
+      type: Object,
-      formatTime() {
+      required: true,
-        return this.deploymentFlagData ?
-          timeFormat(this.deploymentFlagData.time) :
-          timeFormat(this.currentData.time);
-      },
-      formatDate() {
-        return this.deploymentFlagData ?
-          dateFormat(this.deploymentFlagData.time) :
-          dateFormat(this.currentData.time);
-      },
-      cursorStyle() {
-        const xCoordinate = this.deploymentFlagData ?
-          this.deploymentFlagData.xPos :
-          this.currentXCoordinate;
-        const offsetTop = 20 * this.realPixelRatio;
-        const offsetLeft = (70 + xCoordinate) * this.realPixelRatio;
-        const height = (this.graphHeight - this.graphHeightOffset) * this.realPixelRatio;
-        return {
-          top: `${offsetTop}px`,
-          left: `${offsetLeft}px`,
-          height: `${height}px`,
-        };
-      },
-      flagOrientation() {
-        if (this.currentXCoordinate * this.realPixelRatio > 120) {
-          return 'left';
-        }
-        return 'right';
-      },
    },
+    deploymentFlagData: {
+      type: Object,
+      required: false,
+      default: null,
+    },
+    graphHeight: {
+      type: Number,
+      required: true,
+    },
+    graphHeightOffset: {
+      type: Number,
+      required: true,
+    },
+    realPixelRatio: {
+      type: Number,
+      required: true,
+    },
+    showFlagContent: {
+      type: Boolean,
+      required: true,
+    },
+    timeSeries: {
+      type: Array,
+      required: true,
+    },
+    unitOfDisplay: {
+      type: String,
+      required: true,
+    },
+    currentDataIndex: {
+      type: Number,
+      required: true,
+    },
+    legendTitle: {
+      type: String,
+      required: true,
+    },
+  },
+  computed: {
+    formatTime() {
+      return this.deploymentFlagData
+        ? timeFormat(this.deploymentFlagData.time)
+        : timeFormat(this.currentData.time);
+    },
+    formatDate() {
+      return this.deploymentFlagData
+        ? dateFormat(this.deploymentFlagData.time)
+        : dateFormat(this.currentData.time);
+    },
+    cursorStyle() {
+      const xCoordinate = this.deploymentFlagData
+        ? this.deploymentFlagData.xPos
+        : this.currentXCoordinate;
-    methods: {
+      const offsetTop = 20 * this.realPixelRatio;
-      seriesMetricValue(series) {
+      const offsetLeft = (70 + xCoordinate) * this.realPixelRatio;
-        const index = this.deploymentFlagData ?
+      const height = (this.graphHeight - this.graphHeightOffset) * this.realPixelRatio;
-          this.deploymentFlagData.seriesIndex :
-          this.currentDataIndex;
-        const value = series.values[index] &&
-          series.values[index].value;
-        if (isNaN(value)) {
-          return '-';
-        }
-        return `${formatRelevantDigits(value)}${this.unitOfDisplay}`;
-      },
-      seriesMetricLabel(index, series) {
-        if (this.timeSeries.length < 2) {
-          return this.legendTitle;
-        }
-        if (series.metricTag) {
-          return series.metricTag;
-        }
-        return `series ${index + 1}`;
-      },
-      strokeDashArray(type) {
+      return {
-        if (type === 'dashed') return '6, 3';
+        top: `${offsetTop}px`,
-        if (type === 'dotted') return '3, 3';
+        left: `${offsetLeft}px`,
-        return null;
+        height: `${height}px`,
-      },
+      };
+    },
+    flagOrientation() {
+      if (this.currentXCoordinate * this.realPixelRatio > 120) {
+        return 'left';
+      }
+      return 'right';
+    },
+  },
+  methods: {
+    seriesMetricValue(series) {
+      const index = this.deploymentFlagData
+        ? this.deploymentFlagData.seriesIndex
+        : this.currentDataIndex;
+      const value = series.values[index] && series.values[index].value;
+      if (isNaN(value)) {
+        return '-';
+      }
+      return `${formatRelevantDigits(value)}${this.unitOfDisplay}`;
+    },
+    seriesMetricLabel(index, series) {
+      if (this.timeSeries.length < 2) {
+        return this.legendTitle;
+      }
+      if (series.metricTag) {
+        return series.metricTag;
+      }
+      return `series ${index + 1}`;
+    },
+    strokeDashArray(type) {
+      if (type === 'dashed') return '6, 3';
+      if (type === 'dotted') return '3, 3';
+      return null;
    },
-  };
+  },
+};
 </script>
 <template>

--- a/app/assets/javascripts/monitoring/components/graph/legend.vue
+++ b/app/assets/javascripts/monitoring/components/graph/legend.vue
 <script>
-  import { formatRelevantDigits } from '../../../lib/utils/number_utils';
+import { formatRelevantDigits } from '../../../lib/utils/number_utils';
-  export default {
-    props: {
-      graphWidth: {
-        type: Number,
-        required: true,
-      },
-      graphHeight: {
-        type: Number,
-        required: true,
-      },
-      margin: {
-        type: Object,
-        required: true,
-      },
-      measurements: {
-        type: Object,
-        required: true,
-      },
-      legendTitle: {
-        type: String,
-        required: true,
-      },
-      yAxisLabel: {
-        type: String,
-        required: true,
-      },
-      timeSeries: {
-        type: Array,
-        required: true,
-      },
-      unitOfDisplay: {
-        type: String,
-        required: true,
-      },
-      currentDataIndex: {
-        type: Number,
-        required: true,
-      },
-      showLegendGroup: {
-        type: Boolean,
-        required: false,
-        default: true,
-      },
-    },
-    data() {
-      return {
-        yLabelWidth: 0,
-        yLabelHeight: 0,
-        seriesXPosition: 0,
-        metricUsageXPosition: 0,
-      };
-    },
-    computed: {
-      textTransform() {
-        const yCoordinate = (((this.graphHeight - this.margin.top)
-                          + this.measurements.axisLabelLineOffset) / 2) || 0;
-        return `translate(15, ${yCoordinate}) rotate(-90)`;
-      },
-      rectTransform() {
-        const yCoordinate = (((this.graphHeight - this.margin.top)
-                            + this.measurements.axisLabelLineOffset) / 2)
-                            + (this.yLabelWidth / 2) || 0;
-        return `translate(0, ${yCoordinate}) rotate(-90)`;
-      },
-      xPosition() {
-        return (((this.graphWidth + this.measurements.axisLabelLineOffset) / 2)
-               - this.margin.right) || 0;
-      },
-      yPosition() {
-        return ((this.graphHeight - this.margin.top) + this.measurements.axisLabelLineOffset) || 0;
-      },
+export default {
+  props: {
+    graphWidth: {
+      type: Number,
+      required: true,
    },
-    mounted() {
+    graphHeight: {
-      this.$nextTick(() => {
+      type: Number,
-        const bbox = this.$refs.ylabel.getBBox();
+      required: true,
-        this.metricUsageXPosition = 0;
+    },
-        this.seriesXPosition = 0;
+    margin: {
-        if (this.$refs.legendTitleSvg != null) {
+      type: Object,
-          this.seriesXPosition = this.$refs.legendTitleSvg[0].getBBox().width;
+      required: true,
-        }
+    },
-        if (this.$refs.seriesTitleSvg != null) {
+    measurements: {
-          this.metricUsageXPosition = this.$refs.seriesTitleSvg[0].getBBox().width;
+      type: Object,
-        }
+      required: true,
-        this.yLabelWidth = bbox.width + 10; // Added some padding
+    },
-        this.yLabelHeight = bbox.height + 5;
+    legendTitle: {
-      });
+      type: String,
-    },
+      required: true,
-    methods: {
+    },
-      translateLegendGroup(index) {
+    yAxisLabel: {
-        return `translate(0, ${12 * (index)})`;
+      type: String,
-      },
+      required: true,
+    },
-      formatMetricUsage(series) {
+    timeSeries: {
-        const value = series.values[this.currentDataIndex] &&
+      type: Array,
-          series.values[this.currentDataIndex].value;
+      required: true,
-        if (isNaN(value)) {
+    },
-          return '-';
+    unitOfDisplay: {
-        }
+      type: String,
-        return `${formatRelevantDigits(value)} ${this.unitOfDisplay}`;
+      required: true,
-      },
+    },
+    currentDataIndex: {
+      type: Number,
+      required: true,
+    },
+    showLegendGroup: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
+  },
+  data() {
+    return {
+      yLabelWidth: 0,
+      yLabelHeight: 0,
+      seriesXPosition: 0,
+      metricUsageXPosition: 0,
+    };
+  },
+  computed: {
+    textTransform() {
+      const yCoordinate =
+        (this.graphHeight - this.margin.top + this.measurements.axisLabelLineOffset) / 2 || 0;
-      createSeriesString(index, series) {
+      return `translate(15, ${yCoordinate}) rotate(-90)`;
-        if (series.metricTag) {
+    },
-          return `${series.metricTag} ${this.formatMetricUsage(series)}`;
+    rectTransform() {
-        }
+      const yCoordinate =
-        return `${this.legendTitle} series ${index + 1} ${this.formatMetricUsage(series)}`;
+        (this.graphHeight - this.margin.top + this.measurements.axisLabelLineOffset) / 2 +
-      },
+          this.yLabelWidth / 2 || 0;
-      strokeDashArray(type) {
+      return `translate(0, ${yCoordinate}) rotate(-90)`;
-        if (type === 'dashed') return '6, 3';
+    },
-        if (type === 'dotted') return '3, 3';
+    xPosition() {
-        return null;
+      return (this.graphWidth + this.measurements.axisLabelLineOffset) / 2 - this.margin.right || 0;
-      },
+    },
+    yPosition() {
+      return this.graphHeight - this.margin.top + this.measurements.axisLabelLineOffset || 0;
+    },
+  },
+  mounted() {
+    this.$nextTick(() => {
+      const bbox = this.$refs.ylabel.getBBox();
+      this.metricUsageXPosition = 0;
+      this.seriesXPosition = 0;
+      if (this.$refs.legendTitleSvg != null) {
+        this.seriesXPosition = this.$refs.legendTitleSvg[0].getBBox().width;
+      }
+      if (this.$refs.seriesTitleSvg != null) {
+        this.metricUsageXPosition = this.$refs.seriesTitleSvg[0].getBBox().width;
+      }
+      this.yLabelWidth = bbox.width + 10; // Added some padding
+      this.yLabelHeight = bbox.height + 5;
+    });
+  },
+  methods: {
+    translateLegendGroup(index) {
+      return `translate(0, ${12 * index})`;
+    },
+    formatMetricUsage(series) {
+      const value =
+        series.values[this.currentDataIndex] && series.values[this.currentDataIndex].value;
+      if (isNaN(value)) {
+        return '-';
+      }
+      return `${formatRelevantDigits(value)} ${this.unitOfDisplay}`;
+    },
+    createSeriesString(index, series) {
+      if (series.metricTag) {
+        return `${series.metricTag} ${this.formatMetricUsage(series)}`;
+      }
+      return `${this.legendTitle} series ${index + 1} ${this.formatMetricUsage(series)}`;
+    },
+    strokeDashArray(type) {
+      if (type === 'dashed') return '6, 3';
+      if (type === 'dotted') return '3, 3';
+      return null;
    },
-  };
+  },
+};
 </script>
 <template>
  <g class="axis-label-container">

--- a/app/assets/javascripts/monitoring/components/graph/path.vue
+++ b/app/assets/javascripts/monitoring/components/graph/path.vue
 <script>
-  export default {
+export default {
-    props: {
+  props: {
-      generatedLinePath: {
+    generatedLinePath: {
-        type: String,
+      type: String,
-        required: true,
+      required: true,
-      },
-      generatedAreaPath: {
-        type: String,
-        required: true,
-      },
-      lineStyle: {
-        type: String,
-        required: false,
-        default: '',
-      },
-      lineColor: {
-        type: String,
-        required: true,
-      },
-      areaColor: {
-        type: String,
-        required: true,
-      },
    },
-    computed: {
+    generatedAreaPath: {
-      strokeDashArray() {
+      type: String,
-        if (this.lineStyle === 'dashed') return '3, 1';
+      required: true,
-        if (this.lineStyle === 'dotted') return '1, 1';
-        return null;
-      },
    },
-  };
+    lineStyle: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    lineColor: {
+      type: String,
+      required: true,
+    },
+    areaColor: {
+      type: String,
+      required: true,
+    },
+  },
+  computed: {
+    strokeDashArray() {
+      if (this.lineStyle === 'dashed') return '3, 1';
+      if (this.lineStyle === 'dotted') return '1, 1';
+      return null;
+    },
+  },
+};
 </script>
 <template>
  <g>

--- a/app/assets/javascripts/monitoring/components/graph_group.vue
+++ b/app/assets/javascripts/monitoring/components/graph_group.vue
 <script>
-  export default {
+export default {
-    props: {
+  props: {
-      name: {
+    name: {
-        type: String,
+      type: String,
-        required: true,
+      required: true,
-      },
-      showPanels: {
-        type: Boolean,
-        required: false,
-        default: true,
-      },
    },
-  };
+    showPanels: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
+  },
+};
 </script>
 <template>

--- a/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.js
+++ b/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.js
+<script>
 import { parseSeconds, stringifyTime } from '../../../lib/utils/pretty_time';
 export default {
-  name: 'time-tracking-comparison-pane',
+  name: 'TimeTrackingComparisonPane',
  props: {
    timeSpent: {
      type: Number,
@@ -43,47 +44,50 @@ export default {
      return this.timeEstimate >= this.timeSpent ? 'within_estimate' : 'over_estimate';
    },
  },
-  template: `
+};
-    <div class="time-tracking-comparison-pane">
+</script>
+<template>
+  <div class="time-tracking-comparison-pane">
+    <div
+      class="compare-meter"
+      data-toggle="tooltip"
+      data-placement="top"
+      role="timeRemainingDisplay"
+      :aria-valuenow="timeRemainingTooltip"
+      :title="timeRemainingTooltip"
+      :data-original-title="timeRemainingTooltip"
+      :class="timeRemainingStatusClass"
+    >
      <div
-        class="compare-meter"
+        class="meter-container"
-        data-toggle="tooltip"
+        role="timeSpentPercent"
-        data-placement="top"
+        :aria-valuenow="timeRemainingPercent"
-        role="timeRemainingDisplay"
-        :aria-valuenow="timeRemainingTooltip"
-        :title="timeRemainingTooltip"
-        :data-original-title="timeRemainingTooltip"
-        :class="timeRemainingStatusClass"
      >
        <div
-          class="meter-container"
+          :style="{ width: timeRemainingPercent }"
-          role="timeSpentPercent"
+          class="meter-fill"
-          :aria-valuenow="timeRemainingPercent"
        >
-          <div
-            :style="{ width: timeRemainingPercent }"
-            class="meter-fill"
-          />
        </div>
-        <div class="compare-display-container">
+      </div>
-          <div class="compare-display pull-left">
+      <div class="compare-display-container">
-            <span class="compare-label">
+        <div class="compare-display pull-left">
+          <span class="compare-label">
            {{ s__('TimeTracking|Spent') }}
-            </span>
+          </span>
-            <span class="compare-value spent">
+          <span class="compare-value spent">
-              {{ timeSpentHumanReadable }}
+            {{ timeSpentHumanReadable }}
-            </span>
+          </span>
-          </div>
+        </div>
-          <div class="compare-display estimated pull-right">
+        <div class="compare-display estimated pull-right">
-            <span class="compare-label">
+          <span class="compare-label">
-              {{ s__('TimeTrackingEstimated|Est') }}
+            {{ s__('TimeTrackingEstimated|Est') }}
-            </span>
+          </span>
-            <span class="compare-value">
+          <span class="compare-value">
-              {{ timeEstimateHumanReadable }}
+            {{ timeEstimateHumanReadable }}
-            </span>
+          </span>
-          </div>
        </div>
      </div>
    </div>
-  `,
+  </div>
-};
+</template>
--- a/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue
+++ b/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue
@@ -4,7 +4,7 @@ import TimeTrackingCollapsedState from './collapsed_state.vue';
 import timeTrackingSpentOnlyPane from './spent_only_pane';
 import timeTrackingNoTrackingPane from './no_tracking_pane';
 import timeTrackingEstimateOnlyPane from './estimate_only_pane';
-import timeTrackingComparisonPane from './comparison_pane';
+import TimeTrackingComparisonPane from './comparison_pane.vue';
 import eventHub from '../../event_hub';
@@ -15,7 +15,7 @@ export default {
    'time-tracking-estimate-only-pane': timeTrackingEstimateOnlyPane,
    'time-tracking-spent-only-pane': timeTrackingSpentOnlyPane,
    'time-tracking-no-tracking-pane': timeTrackingNoTrackingPane,
-    'time-tracking-comparison-pane': timeTrackingComparisonPane,
+    TimeTrackingComparisonPane,
    'time-tracking-help-state': timeTrackingHelpState,
  },
  props: {

--- a/app/assets/javascripts/vue_merge_request_widget/components/states/sha_mismatch.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/sha_mismatch.vue
@@ -17,8 +17,8 @@ export default {
    />
    <div class="media-body space-children">
      <span class="bold">
-        The source branch HEAD has recently changed.
+        {{ s__(`mrWidget|The source branch HEAD has recently changed.
-        Please reload the page and review the changes before merging.
+Please reload the page and review the changes before merging`) }}
      </span>
    </div>
  </div>

--- a/app/models/project_services/gemnasium_service.rb
+++ b/app/models/project_services/gemnasium_service.rb
@@ -36,7 +36,7 @@ class GemnasiumService < Service
      after: data[:after],
      token: token,
      api_key: api_key,
-      repo: project.repository.path_to_repo
+      repo: project.repository.path_to_repo # Gitaly: fixed by https://gitlab.com/gitlab-org/security-products/gemnasium-migration/issues/9
    )
  end
 end
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -100,10 +100,6 @@ class Repository
    "#<#{self.class.name}:#{@disk_path}>"
  end
-  def create_hooks
-    Gitlab::Git::Repository.create_hooks(path_to_repo, Gitlab.config.gitlab_shell.hooks_path)
-  end
  def commit(ref = 'HEAD')
    return nil unless exists?
    return ref if ref.is_a?(::Commit)

--- a/app/services/verify_pages_domain_service.rb
+++ b/app/services/verify_pages_domain_service.rb
@@ -34,7 +34,8 @@ class VerifyPagesDomainService < BaseService
    # Prevent any pre-existing grace period from being truncated
    reverify = [domain.enabled_until, VERIFICATION_PERIOD.from_now].compact.max
-    domain.update!(verified_at: Time.now, enabled_until: reverify)
+    domain.assign_attributes(verified_at: Time.now, enabled_until: reverify)
+    domain.save!(validate: false)
    if was_disabled
      notify(:enabled)
@@ -47,7 +48,9 @@ class VerifyPagesDomainService < BaseService
  def unverify_domain!
    if domain.verified?
-      domain.update!(verified_at: nil)
+      domain.assign_attributes(verified_at: nil)
+      domain.save!(validate: false)
      notify(:verification_failed)
    end
@@ -55,7 +58,8 @@ class VerifyPagesDomainService < BaseService
  end
  def disable_domain!
-    domain.update!(verified_at: nil, enabled_until: nil)
+    domain.assign_attributes(verified_at: nil, enabled_until: nil)
+    domain.save!(validate: false)
    notify(:disabled)

--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -62,12 +62,16 @@
            = link_to @project.ssh_url_to_repo, project_path(@project)
        - if @project.repository.exists?
          %li
-            %span.light fs:
+            %span.light Gitaly storage name:
            %strong
-              = @project.repository.path_to_repo
+              = @project.repository.storage
+          %li
+            %span.light Gitaly relative path:
+            %strong
+              = @project.repository.relative_path
          %li
-            %span.light Storage:
+            %span.light Storage used:
            %strong= storage_counter(@project.statistics.storage_size)
            (
            = storage_counter(@project.statistics.repository_size)

--- a/app/views/projects/clusters/user/_header.html.haml
+++ b/app/views/projects/clusters/user/_header.html.haml
 %h4.prepend-top-20
  = s_('ClusterIntegration|Enter the details for your Kubernetes cluster')
 %p
-  - link_to_help_page = link_to(s_('ClusterIntegration|documentation'), help_page_path('user/project/clusters/index'), target: '_blank', rel: 'noopener noreferrer')
+  - link_to_help_page = link_to(s_('ClusterIntegration|documentation'), help_page_path('user/project/clusters/index', anchor: 'adding-an-existing-kubernetes-cluster'), target: '_blank', rel: 'noopener noreferrer')
  = s_('ClusterIntegration|Please enter access information for your Kubernetes cluster. If you need help, you can read our %{link_to_help_page} on Kubernetes').html_safe % { link_to_help_page: link_to_help_page }
--- a/app/views/projects/pages_domains/new.html.haml
+++ b/app/views/projects/pages_domains/new.html.haml
@@ -8,3 +8,5 @@
    = render 'form', { f: f }
    .form-actions
      = f.submit 'Create New Domain', class: "btn btn-save"
+      .pull-right
+        = link_to _('Cancel'), project_pages_path(@project), class: 'btn btn-cancel'
--- a/app/workers/git_garbage_collect_worker.rb
+++ b/app/workers/git_garbage_collect_worker.rb
@@ -28,16 +28,17 @@ class GitGarbageCollectWorker
    task = task.to_sym
    cmd = command(task)
-    repo_path = project.repository.path_to_repo
-    description = "'#{cmd.join(' ')}' in #{repo_path}"
-    Gitlab::GitLogger.info(description)
    gitaly_migrate(GITALY_MIGRATED_TASKS[task]) do |is_enabled|
      if is_enabled
        gitaly_call(task, project.repository.raw_repository)
      else
+        repo_path = project.repository.path_to_repo
+        description = "'#{cmd.join(' ')}' in #{repo_path}"
+        Gitlab::GitLogger.info(description)
        output, status = Gitlab::Popen.popen(cmd, repo_path)
        Gitlab::GitLogger.error("#{description} failed:\n#{output}") unless status.zero?
      end
    end

--- a/app/workers/repository_fork_worker.rb
+++ b/app/workers/repository_fork_worker.rb
+# Gitaly issue: https://gitlab.com/gitlab-org/gitaly/issues/1110
 class RepositoryForkWorker
  include ApplicationWorker
  include Gitlab::ShellAdapter

--- a/changelogs/unreleased/27210-add-cancel-btn-to-new-page-domain.yml
+++ b/changelogs/unreleased/27210-add-cancel-btn-to-new-page-domain.yml
+---
+title: Adds cancel btn to new pages domain page
+merge_request: 18026
+author: Jacopo Beschi @jacopo-beschi
+type: added
--- a/changelogs/unreleased/38167-ui-bug-when-creating-new-branch.yml
+++ b/changelogs/unreleased/38167-ui-bug-when-creating-new-branch.yml
+---
+title: Fixed bug in dropdown selector when selecting the same selection again
+merge_request: 14631
+author: bitsapien
+type: fixed
--- a/changelogs/unreleased/43794-fix-domain-verification-validation-errors.yml
+++ b/changelogs/unreleased/43794-fix-domain-verification-validation-errors.yml
+---
+title: Avoid validation errors when running the Pages domain verification service
+merge_request: 17992
+author:
+type: fixed
--- a/changelogs/unreleased/44712-update-asciidoctor-from-1-5-3-to-1-5-6-2.yml
+++ b/changelogs/unreleased/44712-update-asciidoctor-from-1-5-3-to-1-5-6-2.yml
+---
+title: Update asciidoctor-plantuml to 0.0.8
+merge_request: 18022
+author: Takuya Noguchi
+type: performance
--- a/changelogs/unreleased/dm-refs-contains-sha-encoding.yml
+++ b/changelogs/unreleased/dm-refs-contains-sha-encoding.yml
+---
+title: Fix listing commit branch/tags that contain special characters
+merge_request:
+author:
+type: fixed
--- a/changelogs/unreleased/refactor-move-time-tracking-comparison-pane-vue-component.yml
+++ b/changelogs/unreleased/refactor-move-time-tracking-comparison-pane-vue-component.yml
+---
+title: Move TimeTrackingComparisonPane vue component
+merge_request: 17931
+author: George Tsiolis
+type: performance
--- a/changelogs/unreleased/update-unresolved-discussions-vue-component.yml
+++ b/changelogs/unreleased/update-unresolved-discussions-vue-component.yml
+---
+title: Add i18n and update specs for ShaMismatch vue component
+merge_request: 17870
+author: George Tsiolis
+type: performance
--- a/lib/gitlab/bare_repository_import/importer.rb
+++ b/lib/gitlab/bare_repository_import/importer.rb
@@ -63,7 +63,7 @@ module Gitlab
          log " * Created #{project.name} (#{project_full_path})".color(:green)
          project.write_repository_config
-          project.repository.create_hooks
+          Gitlab::Git::Repository.create_hooks(project.repository.path_to_repo, Gitlab.config.gitlab_shell.hooks_path)
          ProjectCacheWorker.perform_async(project.id)
        else

--- a/lib/gitlab/ci/config.rb
+++ b/lib/gitlab/ci/config.rb
@@ -6,6 +6,7 @@ module Gitlab
    class Config
      prepend EE::Gitlab::Ci::Config
+      # EE would override this and utilize opts argument
      def initialize(config, opts = {})
        @config = build_config(config, opts)
        @global = Entry::Global.new(@config)

--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -8,6 +8,7 @@ module Gitlab
    class Repository
      include Gitlab::Git::RepositoryMirroring
      include Gitlab::Git::Popen
+      include Gitlab::EncodingHelper
      ALLOWED_OBJECT_DIRECTORIES_VARIABLES = %w[
        GIT_OBJECT_DIRECTORY
@@ -1493,7 +1494,7 @@ module Gitlab
        names.lines.each do |line|
          next unless line.start_with?(refs_prefix)
-          refs << line.rstrip[left_slice_count..-1]
+          refs << encode_utf8(line.rstrip[left_slice_count..-1])
        end
        refs

--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -21,22 +21,19 @@ module Gitlab
        raise "Unsupported action: #{action}" unless ALLOWED_GIT_HTTP_ACTIONS.include?(action.to_s)
        project = repository.project
-        repo_path = repository.path_to_repo
-        params = {
+        {
          GL_ID: Gitlab::GlId.gl_id(user),
          GL_REPOSITORY: Gitlab::GlRepository.gl_repository(project, is_wiki),
          GL_USERNAME: user&.username,
-          RepoPath: repo_path,
+          ShowAllRefs: show_all_refs,
-          ShowAllRefs: show_all_refs
+          Repository: repository.gitaly_repository.to_h,
-        }
+          RepoPath: 'ignored but not allowed to be empty in gitlab-workhorse',
-        server = {
+          GitalyServer: {
-          address: Gitlab::GitalyClient.address(project.repository_storage),
+            address: Gitlab::GitalyClient.address(project.repository_storage),
-          token: Gitlab::GitalyClient.token(project.repository_storage)
+            token: Gitlab::GitalyClient.token(project.repository_storage)
+          }
        }
-        params[:Repository] = repository.gitaly_repository.to_h
-        params[:GitalyServer] = server
-        params
      end
      def artifact_upload_ok

--- a/spec/javascripts/fixtures/gl_dropdown.html.haml
+++ b/spec/javascripts/fixtures/gl_dropdown.html.haml
 %div
  .dropdown.inline
    %button#js-project-dropdown.dropdown-menu-toggle{type: 'button', data: {toggle: 'dropdown'}}
-      Projects
+      .dropdown-toggle-text
+        Projects
      %i.fa.fa-chevron-down.dropdown-toggle-caret.js-projects-dropdown-toggle
    .dropdown-menu.dropdown-select.dropdown-menu-selectable
      .dropdown-title

--- a/spec/javascripts/gl_dropdown_spec.js
+++ b/spec/javascripts/gl_dropdown_spec.js
@@ -256,4 +256,29 @@ describe('glDropdown', function describeDropdown() {
      });
    });
  });
+  it('should keep selected item after selecting a second time', () => {
+    const options = {
+      isSelectable(item, $el) {
+        return !$el.hasClass('is-active');
+      },
+      toggleLabel(item) {
+        return item && item.id;
+      },
+    };
+    initDropDown.call(this, false, false, options);
+    const $item = $(`${ITEM_SELECTOR}:first() a`, this.$dropdownMenuElement);
+    // select item the first time
+    this.dropdownButtonElement.click();
+    $item.click();
+    expect($item).toHaveClass('is-active');
+    // select item the second time
+    this.dropdownButtonElement.click();
+    $item.click();
+    expect($item).toHaveClass('is-active');
+    expect($('.dropdown-toggle-text')).toHaveText(this.projectsData[0].id.toString());
+  });
 });
--- a/spec/javascripts/helpers/vue_component_helper.js
+++ b/spec/javascripts/helpers/vue_component_helper.js
+export default function removeBreakLine (data) {
+  return data.replace(/\r?\n|\r/g, ' ');
+}
--- a/spec/javascripts/ide/lib/editor_spec.js
+++ b/spec/javascripts/ide/lib/editor_spec.js
@@ -64,22 +64,20 @@ describe('Multi-file editor library', () => {
      instance.createDiffInstance(holder);
-      expect(instance.monaco.editor.createDiffEditor).toHaveBeenCalledWith(
+      expect(instance.monaco.editor.createDiffEditor).toHaveBeenCalledWith(holder, {
-        holder,
+        model: null,
-        {
+        contextmenu: true,
-          model: null,
+        minimap: {
-          contextmenu: true,
+          enabled: false,
-          minimap: {
-            enabled: false,
-          },
-          readOnly: true,
-          scrollBeyondLastLine: false,
-          quickSuggestions: false,
-          occurrencesHighlight: false,
-          renderLineHighlight: 'none',
-          hideCursorInOverviewRuler: true,
        },
-      );
+        readOnly: true,
+        scrollBeyondLastLine: false,
+        quickSuggestions: false,
+        occurrencesHighlight: false,
+        renderLineHighlight: 'none',
+        hideCursorInOverviewRuler: true,
+        wordWrap: 'bounded',
+      });
    });
  });
@@ -117,9 +115,7 @@ describe('Multi-file editor library', () => {
    });
    it('sets original & modified when diff editor', () => {
-      spyOn(instance.instance, 'getEditorType').and.returnValue(
+      spyOn(instance.instance, 'getEditorType').and.returnValue('vs.editor.IDiffEditor');
-        'vs.editor.IDiffEditor',
-      );
      spyOn(instance.instance, 'setModel');
      instance.attachModel(model);
@@ -135,9 +131,7 @@ describe('Multi-file editor library', () => {
      instance.attachModel(model);
-      expect(instance.dirtyDiffController.attachModel).toHaveBeenCalledWith(
+      expect(instance.dirtyDiffController.attachModel).toHaveBeenCalledWith(model);
-        model,
-      );
    });
    it('re-decorates with the dirty diff controller', () => {
@@ -145,9 +139,7 @@ describe('Multi-file editor library', () => {
      instance.attachModel(model);
-      expect(instance.dirtyDiffController.reDecorate).toHaveBeenCalledWith(
+      expect(instance.dirtyDiffController.reDecorate).toHaveBeenCalledWith(model);
-        model,
-      );
    });
  });

--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_conflicts_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_conflicts_spec.js
 import Vue from 'vue';
 import conflictsComponent from '~/vue_merge_request_widget/components/states/mr_widget_conflicts.vue';
 import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import removeBreakLine from 'spec/helpers/vue_component_helper';
 describe('MRWidgetConflicts', () => {
  let Component;
@@ -78,8 +79,9 @@ describe('MRWidgetConflicts', () => {
    });
    it('should tell you to rebase locally', () => {
-      expect(vm.$el.textContent.trim().replace(/\s\s+/g, ' ')).toContain('Fast-forward merge is not possible.');
+      expect(
-      expect(vm.$el.textContent.trim().replace(/\s\s+/g, ' ')).toContain('To merge this request, first rebase locally');
+        removeBreakLine(vm.$el.textContent).trim(),
+      ).toContain('Fast-forward merge is not possible. To merge this request, first rebase locally.');
    });
  });
 });
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_pipeline_blocked_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_pipeline_blocked_spec.js
 import Vue from 'vue';
 import pipelineBlockedComponent from '~/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.vue';
 import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import removeBreakLine from 'spec/helpers/vue_component_helper';
 describe('MRWidgetPipelineBlocked', () => {
  let vm;
@@ -18,6 +19,8 @@ describe('MRWidgetPipelineBlocked', () => {
  });
  it('renders information text', () => {
-    expect(vm.$el.textContent.trim().replace(/[\r\n]+/g, ' ')).toContain('Pipeline blocked. The pipeline for this merge request requires a manual action to proceed');
+    expect(
+      removeBreakLine(vm.$el.textContent).trim(),
+    ).toContain('Pipeline blocked. The pipeline for this merge request requires a manual action to proceed');
  });
 });
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_sha_mismatch_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_sha_mismatch_spec.js
 import Vue from 'vue';
 import ShaMismatch from '~/vue_merge_request_widget/components/states/sha_mismatch.vue';
+import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import removeBreakLine from 'spec/helpers/vue_component_helper';
 describe('ShaMismatch', () => {
-  describe('template', () => {
+  let vm;
+  beforeEach(() => {
    const Component = Vue.extend(ShaMismatch);
-    const vm = new Component({
+    vm = mountComponent(Component);
-      el: document.createElement('div'),
+  });
-    });
-    it('should have correct elements', () => {
+  afterEach(() => {
-      expect(vm.$el.classList.contains('mr-widget-body')).toBeTruthy();
+    vm.$destroy();
-      expect(vm.$el.querySelector('button').getAttribute('disabled')).toBeTruthy();
+  });
-      expect(vm.$el.innerText).toContain('The source branch HEAD has recently changed.');
-      expect(vm.$el.innerText).toContain('Please reload the page and review the changes before merging.');
+  it('should render information message', () => {
-    });
+    expect(vm.$el.querySelector('button').disabled).toEqual(true);
+    expect(
+      removeBreakLine(vm.$el.textContent).trim(),
+    ).toContain('The source branch HEAD has recently changed. Please reload the page and review the changes before merging');
  });
 });
--- a/spec/lib/gitlab/asciidoc_spec.rb
+++ b/spec/lib/gitlab/asciidoc_spec.rb
@@ -48,7 +48,7 @@ module Gitlab
          },
          'images' => {
            input: 'image:https://localhost.com/image.png[Alt text" onerror="alert(7)]',
-            output: "<img src=\"https://localhost.com/image.png\" alt=\"Alt text\">"
+            output: "<div>\n<p><span><img src=\"https://localhost.com/image.png\" alt='Alt text\" onerror=\"alert(7)'></span></p>\n</div>"
          },
          'pre' => {
            input: '```mypre"><script>alert(3)</script>',

--- a/spec/lib/gitlab/git/repository_spec.rb
+++ b/spec/lib/gitlab/git/repository_spec.rb
@@ -604,17 +604,20 @@ describe Gitlab::Git::Repository, seed_helper: true do
    shared_examples 'returning the right branches' do
      let(:head_id) { repository.rugged.head.target.oid }
      let(:new_branch) { head_id }
+      let(:utf8_branch) { 'branch-é' }
      before do
        repository.create_branch(new_branch, 'master')
+        repository.create_branch(utf8_branch, 'master')
      end
      after do
        repository.delete_branch(new_branch)
+        repository.delete_branch(utf8_branch)
      end
      it 'displays that branch' do
-        expect(repository.branch_names_contains_sha(head_id)).to include('master', new_branch)
+        expect(repository.branch_names_contains_sha(head_id)).to include('master', new_branch, utf8_branch)
      end
    end

--- a/spec/lib/gitlab/workhorse_spec.rb
+++ b/spec/lib/gitlab/workhorse_spec.rb
@@ -275,7 +275,7 @@ describe Gitlab::Workhorse do
  describe '.git_http_ok' do
    let(:user) { create(:user) }
-    let(:repo_path) { repository.path_to_repo }
+    let(:repo_path) { 'ignored but not allowed to be empty in gitlab-workhorse' }
    let(:action) { 'info_refs' }
    let(:params) do
      {

--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -501,28 +501,6 @@ describe Repository do
    end
  end
-  describe '#create_hooks' do
-    let(:hook_path) { File.join(repository.path_to_repo, 'hooks') }
-    it 'symlinks the global hooks directory' do
-      repository.create_hooks
-      expect(File.symlink?(hook_path)).to be true
-      expect(File.readlink(hook_path)).to eq(Gitlab.config.gitlab_shell.hooks_path)
-    end
-    it 'replaces existing symlink with the right directory' do
-      FileUtils.mkdir_p(hook_path)
-      expect(File.symlink?(hook_path)).to be false
-      repository.create_hooks
-      expect(File.symlink?(hook_path)).to be true
-      expect(File.readlink(hook_path)).to eq(Gitlab.config.gitlab_shell.hooks_path)
-    end
-  end
  describe "#create_dir" do
    it "commits a change that creates a new directory" do
      expect do

--- a/spec/requests/git_http_spec.rb
+++ b/spec/requests/git_http_spec.rb
@@ -163,7 +163,7 @@ describe 'Git HTTP requests' do
            download(path) do |response|
              json_body = ActiveSupport::JSON.decode(response.body)
-              expect(json_body['RepoPath']).to include(wiki.repository.disk_path)
+              expect(json_body['Repository']['relative_path']).to eq(wiki.repository.relative_path)
            end
          end
        end

--- a/spec/services/verify_pages_domain_service_spec.rb
+++ b/spec/services/verify_pages_domain_service_spec.rb
@@ -93,6 +93,25 @@ describe VerifyPagesDomainService do
          expect(domain).not_to be_enabled
        end
      end
+      context 'invalid domain' do
+        let(:domain) { build(:pages_domain, :expired, :with_missing_chain) }
+        before do
+          domain.save(validate: false)
+        end
+        it 'can be disabled' do
+          error_status[:message] += '. It is now disabled.'
+          stub_resolver
+          expect(service.execute).to eq(error_status)
+          expect(domain).not_to be_verified
+          expect(domain).not_to be_enabled
+        end
+      end
    end
    context 'timeout behaviour' do