Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-28

# Conflicts:
#	app/views/admin/application_settings/_ci_cd.html.haml
#	app/views/admin/application_settings/_form.html.haml
#	lib/gitlab/ci/config.rb
#	spec/spec_helper.rb

[ci skip]

.gitignore

@@ -51,6 +51,7 @@ eslint-report.html
 /db/data.yml
 /doc/code/*
 /dump.rdb
+/jsconfig.json
 /log/*.log*
 /node_modules/
 /nohup.out

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-plantuml', '0.0.7'
+gem 'asciidoctor', '~> 1.5.6'
+gem 'asciidoctor-plantuml', '0.0.8'
 gem 'rouge', '~> 2.0'
 gem 'truncato', '~> 0.7.9'
 gem 'bootstrap_form', '~> 2.7.0'

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-plantuml (0.0.7)
+    asciidoctor (1.5.6.2)
+    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-plantuml (= 0.0.7)
+  asciidoctor (~> 1.5.6)
+  asciidoctor-plantuml (= 0.0.8)
   asset_sync (~> 2.2.0)
   attr_encrypted (~> 3.0.0)
   awesome_print (~> 1.2.0)

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) {

app/assets/javascripts/ide/lib/editor_options.js

@@ -6,6 +6,7 @@ export const defaultEditorOptions = {
   minimap: {
     enabled: false,
   },
+  wordWrap: 'bounded',
 };
 
 export default [

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

 <script>
-  import _ from 'underscore';
-  import Flash from '../../flash';
-  import MonitoringService from '../services/monitoring_service';
-  import GraphGroup from './graph_group.vue';
-  import Graph from './graph.vue';
-  import EmptyState from './empty_state.vue';
-  import MonitoringStore from '../stores/monitoring_store';
-  import eventHub from '../event_hub';
+import _ from 'underscore';
+import Flash from '../../flash';
+import MonitoringService from '../services/monitoring_service';
+import GraphGroup from './graph_group.vue';
+import Graph from './graph.vue';
+import EmptyState from './empty_state.vue';
+import MonitoringStore from '../stores/monitoring_store';
+import eventHub from '../event_hub';
 
-  export default {
-    components: {
-      Graph,
-      GraphGroup,
-      EmptyState,
+export default {
+  components: {
+    Graph,
+    GraphGroup,
+    EmptyState,
+  },
+  props: {
+    hasMetrics: {
+      type: Boolean,
+      required: false,
+      default: true,
     },
-
-    props: {
-      hasMetrics: {
-        type: Boolean,
-        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,
-      },
+    showLegend: {
+      type: Boolean,
+      required: false,
+      default: true,
     },
-
-    data() {
-      return {
-        store: new MonitoringStore(),
-        state: 'gettingStarted',
-        showEmptyState: true,
-        updateAspectRatio: false,
-        updatedAspectRatios: 0,
-        hoverData: {},
-        resizeThrottled: {},
-      };
+    showPanels: {
+      type: Boolean,
+      required: false,
+      default: true,
     },
-
-    created() {
-      this.service = new MonitoringService({
-        metricsEndpoint: this.metricsEndpoint,
-        deploymentEndpoint: this.deploymentEndpoint,
-      });
-      eventHub.$on('toggleAspectRatio', this.toggleAspectRatio);
-      eventHub.$on('hoverChanged', this.hoverChanged);
+    forceSmallGraph: {
+      type: Boolean,
+      required: false,
+      default: false,
     },
-
-    beforeDestroy() {
-      eventHub.$off('toggleAspectRatio', this.toggleAspectRatio);
-      eventHub.$off('hoverChanged', this.hoverChanged);
-      window.removeEventListener('resize', this.resizeThrottled, false);
+    documentationPath: {
+      type: String,
+      required: true,
     },
-
-    mounted() {
-      this.resizeThrottled = _.throttle(this.resize, 600);
-      if (!this.hasMetrics) {
-        this.state = 'gettingStarted';
-      } else {
-        this.getGraphsData();
-        window.addEventListener('resize', this.resizeThrottled, false);
+    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,
+    },
+  },
+  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;
       }
     },
-
-    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) {
-        this.hoverData = data;
-      },
+    hoverChanged(data) {
+      this.hoverData = data;
     },
-  };
+  },
+};
 </script>
 
 <template>

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

 <script>
-  export default {
-    props: {
-      documentationPath: {
-        type: String,
-        required: true,
-      },
-      settingsPath: {
-        type: String,
-        required: false,
-        default: '',
-      },
-      clustersPath: {
-        type: String,
-        required: false,
-        default: '',
-      },
-      selectedState: {
-        type: String,
-        required: true,
-      },
-      emptyGettingStartedSvgPath: {
-        type: String,
-        required: true,
-      },
-      emptyLoadingSvgPath: {
-        type: String,
-        required: true,
-      },
-      emptyNoDataSvgPath: {
-        type: String,
-        required: true,
-      },
-      emptyUnableToConnectSvgPath: {
-        type: String,
-        required: true,
-      },
+export default {
+  props: {
+    documentationPath: {
+      type: String,
+      required: true,
+    },
+    settingsPath: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    clustersPath: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    selectedState: {
+      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
+    emptyGettingStartedSvgPath: {
+      type: String,
+      required: true,
+    },
+    emptyLoadingSvgPath: {
+      type: String,
+      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',
-            buttonPath: this.clustersPath,
-            secondaryButtonText: 'Configure existing Prometheus',
-            secondaryButtonPath: this.settingsPath,
-          },
-          loading: {
-            svgUrl: this.emptyLoadingSvgPath,
-            title: 'Waiting for performance data',
-            description: `Creating graphs uses the data from the Prometheus server.
+          buttonText: 'Install Prometheus on clusters',
+          buttonPath: this.clustersPath,
+          secondaryButtonText: 'Configure existing Prometheus',
+          secondaryButtonPath: this.settingsPath,
+        },
+        loading: {
+          svgUrl: this.emptyLoadingSvgPath,
+          title: 'Waiting for performance data',
+          description: `Creating graphs uses the data from the Prometheus server.
               If this takes a long time, ensure that data is available.`,
-            buttonText: 'View documentation',
-            buttonPath: this.documentationPath,
-          },
-          noData: {
-            svgUrl: this.emptyNoDataSvgPath,
-            title: 'No data found',
-            description: `You are connected to the Prometheus server, but there is currently
+          buttonText: 'View documentation',
+          buttonPath: this.documentationPath,
+        },
+        noData: {
+          svgUrl: this.emptyNoDataSvgPath,
+          title: 'No data found',
+          description: `You are connected to the Prometheus server, but there is currently
               no data to display.`,
-            buttonText: 'Configure Prometheus',
-            buttonPath: this.settingsPath,
-          },
-          unableToConnect: {
-            svgUrl: this.emptyUnableToConnectSvgPath,
-            title: 'Unable to connect to Prometheus server',
-            description: 'Ensure connectivity is available from the GitLab server to the ',
-            buttonText: 'View documentation',
-            buttonPath: this.documentationPath,
-          },
+          buttonText: 'Configure Prometheus',
+          buttonPath: this.settingsPath,
+        },
+        unableToConnect: {
+          svgUrl: this.emptyUnableToConnectSvgPath,
+          title: 'Unable to connect to Prometheus server',
+          description: 'Ensure connectivity is available from the GitLab server to the ',
+          buttonText: 'View documentation',
+          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>

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

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

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

 <script>
-  import { dateFormat, timeFormat } from '../../utils/date_time_formatters';
-  import { formatRelevantDigits } from '../../../lib/utils/number_utils';
-  import icon from '../../../vue_shared/components/icon.vue';
+import { dateFormat, timeFormat } from '../../utils/date_time_formatters';
+import { formatRelevantDigits } from '../../../lib/utils/number_utils';
+import icon from '../../../vue_shared/components/icon.vue';
 
-  export default {
-    components: {
-      icon,
-    },
-    props: {
-      currentXCoordinate: {
-        type: Number,
-        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,
-      },
+export default {
+  components: {
+    icon,
+  },
+  props: {
+    currentXCoordinate: {
+      type: Number,
+      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;
-
-        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';
-      },
+    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,
+    },
+  },
+  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: {
-      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}`;
-      },
+      const offsetTop = 20 * this.realPixelRatio;
+      const offsetLeft = (70 + xCoordinate) * this.realPixelRatio;
+      const height = (this.graphHeight - this.graphHeightOffset) * this.realPixelRatio;
 
-      strokeDashArray(type) {
-        if (type === 'dashed') return '6, 3';
-        if (type === 'dotted') return '3, 3';
-        return null;
-      },
+      return {
+        top: `${offsetTop}px`,
+        left: `${offsetLeft}px`,
+        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>

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

 <script>
-  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;
-      },
+import { formatRelevantDigits } from '../../../lib/utils/number_utils';
 
+export default {
+  props: {
+    graphWidth: {
+      type: Number,
+      required: true,
     },
-    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}`;
-      },
+    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;
 
-      createSeriesString(index, series) {
-        if (series.metricTag) {
-          return `${series.metricTag} ${this.formatMetricUsage(series)}`;
-        }
-        return `${this.legendTitle} series ${index + 1} ${this.formatMetricUsage(series)}`;
-      },
+      return `translate(15, ${yCoordinate}) rotate(-90)`;
+    },
+    rectTransform() {
+      const yCoordinate =
+        (this.graphHeight - this.margin.top + this.measurements.axisLabelLineOffset) / 2 +
+          this.yLabelWidth / 2 || 0;
 
-      strokeDashArray(type) {
-        if (type === 'dashed') return '6, 3';
-        if (type === 'dotted') return '3, 3';
-        return null;
-      },
+      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;
+    },
+  },
+  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">

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

 <script>
-  export default {
-    props: {
-      generatedLinePath: {
-        type: String,
-        required: true,
-      },
-      generatedAreaPath: {
-        type: String,
-        required: true,
-      },
-      lineStyle: {
-        type: String,
-        required: false,
-        default: '',
-      },
-      lineColor: {
-        type: String,
-        required: true,
-      },
-      areaColor: {
-        type: String,
-        required: true,
-      },
+export default {
+  props: {
+    generatedLinePath: {
+      type: String,
+      required: true,
     },
-    computed: {
-      strokeDashArray() {
-        if (this.lineStyle === 'dashed') return '3, 1';
-        if (this.lineStyle === 'dotted') return '1, 1';
-        return null;
-      },
+    generatedAreaPath: {
+      type: String,
+      required: true,
     },
-  };
+    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>

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

 <script>
-  export default {
-    props: {
-      name: {
-        type: String,
-        required: true,
-      },
-      showPanels: {
-        type: Boolean,
-        required: false,
-        default: true,
-      },
+export default {
+  props: {
+    name: {
+      type: String,
+      required: true,
     },
-  };
+    showPanels: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
+  },
+};
 </script>
 
 <template>

app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.js → app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue

+<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"
-        data-toggle="tooltip"
-        data-placement="top"
-        role="timeRemainingDisplay"
-        :aria-valuenow="timeRemainingTooltip"
-        :title="timeRemainingTooltip"
-        :data-original-title="timeRemainingTooltip"
-        :class="timeRemainingStatusClass"
+        class="meter-container"
+        role="timeSpentPercent"
+        :aria-valuenow="timeRemainingPercent"
       >
         <div
-          class="meter-container"
-          role="timeSpentPercent"
-          :aria-valuenow="timeRemainingPercent"
+          :style="{ width: timeRemainingPercent }"
+          class="meter-fill"
         >
-          <div
-            :style="{ width: timeRemainingPercent }"
-            class="meter-fill"
-          />
         </div>
-        <div class="compare-display-container">
-          <div class="compare-display pull-left">
-            <span class="compare-label">
+      </div>
+      <div class="compare-display-container">
+        <div class="compare-display pull-left">
+          <span class="compare-label">
             {{ s__('TimeTracking|Spent') }}
-            </span>
-            <span class="compare-value spent">
-              {{ timeSpentHumanReadable }}
-            </span>
-          </div>
-          <div class="compare-display estimated pull-right">
-            <span class="compare-label">
-              {{ s__('TimeTrackingEstimated|Est') }}
-            </span>
-            <span class="compare-value">
-              {{ timeEstimateHumanReadable }}
-            </span>
-          </div>
+          </span>
+          <span class="compare-value spent">
+            {{ timeSpentHumanReadable }}
+          </span>
+        </div>
+        <div class="compare-display estimated pull-right">
+          <span class="compare-label">
+            {{ s__('TimeTrackingEstimated|Est') }}
+          </span>
+          <span class="compare-value">
+            {{ timeEstimateHumanReadable }}
+          </span>
         </div>
       </div>
     </div>
-  `,
-};
+  </div>
+</template>

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: {

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.
-        Please reload the page and review the changes before merging.
+        {{ s__(`mrWidget|The source branch HEAD has recently changed.
+Please reload the page and review the changes before merging`) }}
       </span>
     </div>
   </div>

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

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)

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)
 

app/views/admin/application_settings/_ci_cd.html.haml

@@ -23,9 +23,12 @@
           = f.label :shared_runners_enabled do
             = f.check_box :shared_runners_enabled
             Enable shared runners for new projects
+<<<<<<< HEAD
 
     = render 'shared_runners_minutes_setting', form: f
 
+=======
+>>>>>>> upstream/master
     .form-group
       = f.label :shared_runners_text, class: 'control-label col-sm-2'
       .col-sm-10

app/views/admin/application_settings/_form.html.haml

 = form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f|
   = form_errors(@application_setting)
 
+<<<<<<< HEAD
   - if License.feature_available?(:repository_mirrors)
     = render partial: 'repository_mirrors_form', locals: { f: f }
 
+=======
+>>>>>>> upstream/master
   - if Gitlab.config.registry.enabled
     %fieldset
       %legend Container Registry

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)

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 }

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'

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

app/workers/repository_fork_worker.rb

+# Gitaly issue: https://gitlab.com/gitlab-org/gitaly/issues/1110
 class RepositoryForkWorker
   include ApplicationWorker
   include Gitlab::ShellAdapter

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

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

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

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

changelogs/unreleased/dm-refs-contains-sha-encoding.yml

+---
+title: Fix listing commit branch/tags that contain special characters
+merge_request:
+author:
+type: fixed

changelogs/unreleased/refactor-move-time-tracking-comparison-pane-vue-component.yml

+---
+title: Move TimeTrackingComparisonPane vue component
+merge_request: 17931
+author: George Tsiolis
+type: performance

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

changelogs/unreleased/workhorse-gitaly-mandatory.yml

----
-title: Make all workhorse gitaly calls opt-out
-merge_request: 18002
-author:
-type: other

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

lib/gitlab/ci/config.rb

@@ -4,7 +4,13 @@ module Gitlab
     # Base GitLab CI Configuration facade
     #
     class Config
+<<<<<<< HEAD
       prepend EE::Gitlab::Ci::Config
+=======
+      # EE would override this and utilize opts argument
+      def initialize(config, opts = {})
+        @config = Loader.new(config).load!
+>>>>>>> upstream/master
 
       def initialize(config, opts = {})
         @config = build_config(config, opts)

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

lib/gitlab/workhorse.rb

@@ -21,12 +21,10 @@ 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
         }
         server = {
@@ -44,7 +42,7 @@ module Gitlab
       end
 
       def send_git_blob(repository, blob)
-        params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_raw_show, Gitlab::GitalyClient::MigrationStatus::OPT_OUT)
+        params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_raw_show)
                    {
                      'GitalyServer' => gitaly_server_hash(repository),
                      'GetBlobRequest' => {
@@ -72,7 +70,7 @@ module Gitlab
         params = repository.archive_metadata(ref, Gitlab.config.gitlab.repository_downloads_path, format)
         raise "Repository or ref not found" if params.empty?
 
-        if Gitlab::GitalyClient.feature_enabled?(:workhorse_archive, Gitlab::GitalyClient::MigrationStatus::OPT_OUT)
+        if Gitlab::GitalyClient.feature_enabled?(:workhorse_archive)
           params.merge!(
             'GitalyServer' => gitaly_server_hash(repository),
             'GitalyRepository' => repository.gitaly_repository.to_h
@@ -89,7 +87,7 @@ module Gitlab
       end
 
       def send_git_diff(repository, diff_refs)
-        params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_send_git_diff, Gitlab::GitalyClient::MigrationStatus::OPT_OUT)
+        params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_send_git_diff)
                    {
                      'GitalyServer' => gitaly_server_hash(repository),
                      'RawDiffRequest' => Gitaly::RawDiffRequest.new(
@@ -107,7 +105,7 @@ module Gitlab
       end
 
       def send_git_patch(repository, diff_refs)
-        params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_send_git_patch, Gitlab::GitalyClient::MigrationStatus::OPT_OUT)
+        params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_send_git_patch)
                    {
                      'GitalyServer' => gitaly_server_hash(repository),
                      'RawPatchRequest' => Gitaly::RawPatchRequest.new(

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

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());
+  });
 });
+

spec/javascripts/helpers/vue_component_helper.js

+export default function removeBreakLine (data) {
+  return data.replace(/\r?\n|\r/g, ' ');
+}

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(
-        holder,
-        {
-          model: null,
-          contextmenu: true,
-          minimap: {
-            enabled: false,
-          },
-          readOnly: true,
-          scrollBeyondLastLine: false,
-          quickSuggestions: false,
-          occurrencesHighlight: false,
-          renderLineHighlight: 'none',
-          hideCursorInOverviewRuler: true,
+      expect(instance.monaco.editor.createDiffEditor).toHaveBeenCalledWith(holder, {
+        model: null,
+        contextmenu: true,
+        minimap: {
+          enabled: false,
         },
-      );
+        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(
-        'vs.editor.IDiffEditor',
-      );
+      spyOn(instance.instance, 'getEditorType').and.returnValue('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(
-        model,
-      );
+      expect(instance.dirtyDiffController.attachModel).toHaveBeenCalledWith(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(
-        model,
-      );
+      expect(instance.dirtyDiffController.reDecorate).toHaveBeenCalledWith(model);
     });
   });
 

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(vm.$el.textContent.trim().replace(/\s\s+/g, ' ')).toContain('To merge this request, first rebase locally');
+      expect(
+        removeBreakLine(vm.$el.textContent).trim(),
+      ).toContain('Fast-forward merge is not possible. To merge this request, first rebase locally.');
     });
   });
 });

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');
   });
 });

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({
-      el: document.createElement('div'),
-    });
-    it('should have correct elements', () => {
-      expect(vm.$el.classList.contains('mr-widget-body')).toBeTruthy();
-      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.');
-    });
+    vm = mountComponent(Component);
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  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');
   });
 });

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>',

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
 

spec/lib/gitlab/workhorse_spec.rb

@@ -55,7 +55,7 @@ describe Gitlab::Workhorse do
       end
     end
 
-    context 'when Gitaly workhorse_archive feature is disabled', :disable_gitaly do
+    context 'when Gitaly workhorse_archive feature is disabled', :skip_gitaly_mock do
       it 'sets the header correctly' do
         key, command, params = decode_workhorse_header(subject)
 
@@ -100,7 +100,7 @@ describe Gitlab::Workhorse do
       end
     end
 
-    context 'when Gitaly workhorse_send_git_patch feature is disabled', :disable_gitaly do
+    context 'when Gitaly workhorse_send_git_patch feature is disabled', :skip_gitaly_mock do
       it 'sets the header correctly' do
         key, command, params = decode_workhorse_header(subject)
 
@@ -173,7 +173,7 @@ describe Gitlab::Workhorse do
       end
     end
 
-    context 'when Gitaly workhorse_send_git_diff feature is disabled', :disable_gitaly do
+    context 'when Gitaly workhorse_send_git_diff feature is disabled', :skip_gitaly_mock do
       it 'sets the header correctly' do
         key, command, params = decode_workhorse_header(subject)
 
@@ -275,14 +275,12 @@ describe Gitlab::Workhorse do
 
   describe '.git_http_ok' do
     let(:user) { create(:user) }
-    let(:repo_path) { repository.path_to_repo }
     let(:action) { 'info_refs' }
     let(:params) do
       {
         GL_ID: "user-#{user.id}",
         GL_USERNAME: user.username,
         GL_REPOSITORY: "project-#{project.id}",
-        RepoPath: repo_path,
         ShowAllRefs: false
       }
     end
@@ -297,7 +295,6 @@ describe Gitlab::Workhorse do
           GL_ID: "user-#{user.id}",
           GL_USERNAME: user.username,
           GL_REPOSITORY: "wiki-#{project.id}",
-          RepoPath: repo_path,
           ShowAllRefs: false
         }
       end
@@ -455,7 +452,7 @@ describe Gitlab::Workhorse do
       end
     end
 
-    context 'when Gitaly workhorse_raw_show feature is disabled', :disable_gitaly do
+    context 'when Gitaly workhorse_raw_show feature is disabled', :skip_gitaly_mock do
       it 'sets the header correctly' do
         key, command, params = decode_workhorse_header(subject)
 

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

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

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

spec/spec_helper.rb

@@ -104,6 +104,7 @@ RSpec.configure do |config|
     TestEnv.init
   end
 
+<<<<<<< HEAD
   # EE-specific start
   config.before(:all) do
     License.destroy_all
@@ -111,6 +112,8 @@ RSpec.configure do |config|
   end
   # EE-specific stop
 
+=======
+>>>>>>> upstream/master
   config.after(:all) do
     TestEnv.clean_test_path
   end