Merge branch 'gl-remove-window-scope' into 'master'

Removes merge conflicts vue code from globalnamespace

See merge request gitlab-org/gitlab-ce!19750

app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js

-/* eslint-disable no-param-reassign, comma-dangle */
+/* eslint-disable no-param-reassign */
 
 import Vue from 'vue';
+import actionsMixin from '../mixins/line_conflict_actions';
+import utilsMixin from '../mixins/line_conflict_utils';
 
-((global) => {
+(global => {
   global.mergeConflicts = global.mergeConflicts || {};
 
   global.mergeConflicts.inlineConflictLines = Vue.extend({
-    mixins: [global.mergeConflicts.utils, global.mergeConflicts.actions],
+    mixins: [utilsMixin, actionsMixin],
     props: {
       file: {
         type: Object,

app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js

 /* eslint-disable no-param-reassign, comma-dangle */
 
 import Vue from 'vue';
+import actionsMixin from '../mixins/line_conflict_actions';
+import utilsMixin from '../mixins/line_conflict_utils';
 
 ((global) => {
   global.mergeConflicts = global.mergeConflicts || {};
 
   global.mergeConflicts.parallelConflictLines = Vue.extend({
-    mixins: [global.mergeConflicts.utils, global.mergeConflicts.actions],
+    mixins: [utilsMixin, actionsMixin],
     props: {
       file: {
         type: Object,

app/assets/javascripts/merge_conflicts/merge_conflict_service.js

-/* eslint-disable no-param-reassign, comma-dangle */
 import axios from '../lib/utils/axios_utils';
 
-((global) => {
-  global.mergeConflicts = global.mergeConflicts || {};
-
-  class mergeConflictsService {
+export default class MergeConflictsService {
   constructor(options) {
     this.conflictsPath = options.conflictsPath;
     this.resolveConflictsPath = options.resolveConflictsPath;
@@ -17,7 +13,4 @@ import axios from '../lib/utils/axios_utils';
   submitResolveConflicts(data) {
     return axios.post(this.resolveConflictsPath, data);
   }
-  }
-
-  global.mergeConflicts.mergeConflictsService = mergeConflictsService;
-})(window.gl || (window.gl = {}));
+}

app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js

@@ -5,7 +5,7 @@ import Vue from 'vue';
 import Flash from '../flash';
 import initIssuableSidebar from '../init_issuable_sidebar';
 import './merge_conflict_store';
-import './merge_conflict_service';
+import MergeConflictsService from './merge_conflict_service';
 import './mixins/line_conflict_utils';
 import './mixins/line_conflict_actions';
 import './components/diff_file_editor';
@@ -17,7 +17,7 @@ export default function initMergeConflicts() {
   const INTERACTIVE_RESOLVE_MODE = 'interactive';
   const conflictsEl = document.querySelector('#conflicts');
   const mergeConflictsStore = gl.mergeConflicts.mergeConflictsStore;
-  const mergeConflictsService = new gl.mergeConflicts.mergeConflictsService({
+  const mergeConflictsService = new MergeConflictsService({
     conflictsPath: conflictsEl.dataset.conflictsPath,
     resolveConflictsPath: conflictsEl.dataset.resolveConflictsPath
   });

app/assets/javascripts/merge_conflicts/mixins/line_conflict_actions.js

-/* eslint-disable no-param-reassign, comma-dangle */
-
-((global) => {
-  global.mergeConflicts = global.mergeConflicts || {};
-
-  global.mergeConflicts.actions = {
+export default {
   methods: {
     handleSelected(file, sectionId, selection) {
       gl.mergeConflicts.mergeConflictsStore.handleSelected(file, sectionId, selection);
-      }
-    }
-  };
-})(window.gl || (window.gl = {}));
+    },
+  },
+};

app/assets/javascripts/merge_conflicts/mixins/line_conflict_utils.js

-/* eslint-disable no-param-reassign, quote-props, comma-dangle */
-
-((global) => {
-  global.mergeConflicts = global.mergeConflicts || {};
-
-  global.mergeConflicts.utils = {
+export default {
   methods: {
     lineCssClass(line) {
       return {
-          'head': line.isHead,
-          'origin': line.isOrigin,
-          'match': line.hasMatch,
-          'selected': line.isSelected,
-          'unselected': line.isUnselected
+        head: line.isHead,
+        origin: line.isOrigin,
+        match: line.hasMatch,
+        selected: line.isSelected,
+        unselected: line.isUnselected,
       };
-      }
-    }
-  };
-})(window.gl || (window.gl = {}));
+    },
+  },
+};