Resolve conflicts in JS files after the move of EE-specific JS files to ee/

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/assets/javascripts/boards/components/board_new_issue.vue

 <script>
 import eventHub from '../eventhub';
-<<<<<<< HEAD:app/assets/javascripts/boards/components/board_new_issue.vue
 import ProjectSelect from 'ee/boards/components/project_select.vue'; // eslint-disable-line import/first
-=======
->>>>>>> upstream/master:app/assets/javascripts/boards/components/board_new_issue.vue
 import ListIssue from '../models/issue';
 
 const Store = gl.issueBoards.BoardsStore;
@@ -31,7 +28,6 @@ export default {
       selectedProject: {},
     };
   },
-<<<<<<< HEAD:app/assets/javascripts/boards/components/board_new_issue.vue
   computed: {
     disabled() {
       if (this.groupId) {
@@ -43,10 +39,6 @@ export default {
   mounted() {
     this.$refs.input.focus();
     eventHub.$on('setSelectedProject', this.setSelectedProject);
-=======
-  mounted() {
-    this.$refs.input.focus();
->>>>>>> upstream/master:app/assets/javascripts/boards/components/board_new_issue.vue
   },
   methods: {
     submit(e) {
@@ -98,7 +90,6 @@ export default {
 </script>
 
 <template>
-<<<<<<< HEAD:app/assets/javascripts/boards/components/board_new_issue.vue
   <div class="board-new-issue-form">
     <div class="card">
       <form @submit="submit($event)">
@@ -147,49 +138,5 @@ export default {
         </div>
       </form>
     </div>
-=======
-  <div class="card board-new-issue-form">
-    <form @submit="submit($event)">
-      <div
-        class="flash-container"
-        v-if="error"
-      >
-        <div class="flash-alert">
-          An error occurred. Please try again.
-        </div>
-      </div>
-      <label
-        class="label-light"
-        :for="list.id + '-title'"
-      >
-        Title
-      </label>
-      <input
-        class="form-control"
-        type="text"
-        v-model="title"
-        ref="input"
-        autocomplete="off"
-        :id="list.id + '-title'"
-      />
-      <div class="clearfix prepend-top-10">
-        <button
-          class="btn btn-success pull-left"
-          type="submit"
-          :disabled="title === ''"
-          ref="submit-button"
-        >
-          Submit issue
-        </button>
-        <button
-          class="btn btn-default pull-right"
-          type="button"
-          @click="cancel"
-        >
-          Cancel
-        </button>
-      </div>
-    </form>
->>>>>>> upstream/master:app/assets/javascripts/boards/components/board_new_issue.vue
   </div>
 </template>

app/assets/javascripts/boards/index.js

@@ -25,15 +25,12 @@ import './components/board_sidebar';
 import './components/new_list_dropdown';
 import './components/modal/index';
 import '~/vue_shared/vue_resource_interceptor'; // eslint-disable-line import/first
-<<<<<<< HEAD
 
 import 'ee/boards/models/project'; // eslint-disable-line import/first
 import 'ee/boards/components/boards_selector'; // eslint-disable-line import/first
 import collapseIcon from 'ee/boards/icons/fullscreen_collapse.svg'; // eslint-disable-line import/first
 import expandIcon from 'ee/boards/icons/fullscreen_expand.svg'; // eslint-disable-line import/first
 import tooltip from '~/vue_shared/directives/tooltip'; // eslint-disable-line import/first
-=======
->>>>>>> upstream/master
 
 export default () => {
   const $boardApp = document.getElementById('board-app');

app/assets/javascripts/boards/stores/boards_store.js

@@ -2,10 +2,7 @@
 /* global List */
 import _ from 'underscore';
 import Cookies from 'js-cookie';
-<<<<<<< HEAD
 import boardsStoreEE from 'ee/boards/stores/boards_store_ee';
-=======
->>>>>>> upstream/master
 import { getUrlParamsArray } from '~/lib/utils/common_utils';
 
 window.gl = window.gl || {};

app/assets/javascripts/environments/components/environments_table.vue

@@ -4,11 +4,8 @@
  */
 import loadingIcon from '~/vue_shared/components/loading_icon.vue';
 import environmentItem from './environment_item.vue';
-<<<<<<< HEAD
 
 import deployBoard from 'ee/environments/components/deploy_board_component.vue'; // eslint-disable-line import/first
-=======
->>>>>>> upstream/master
 
 export default {
   components: {

app/assets/javascripts/ide/components/repo_file.vue

 <script>
   import { mapState } from 'vuex';
-<<<<<<< HEAD
 
-=======
->>>>>>> upstream/master
   import timeAgoMixin from '~/vue_shared/mixins/timeago';
   import skeletonLoadingContainer from '~/vue_shared/components/skeleton_loading_container.vue';
   import fileIcon from '~/vue_shared/components/file_icon.vue';
   import newDropdown from './new_dropdown/index.vue';
-<<<<<<< HEAD
 
   import fileStatusIcon from 'ee/ide/components/repo_file_status_icon.vue'; // eslint-disable-line import/first
   import changedFileIcon from 'ee/ide/components/changed_file_icon.vue'; // eslint-disable-line import/first
-=======
->>>>>>> upstream/master
 
   export default {
     components: {

app/assets/javascripts/ide/components/repo_tab.vue

 <script>
   import { mapActions } from 'vuex';
-<<<<<<< HEAD
 
   import fileIcon from '~/vue_shared/components/file_icon.vue';
   import icon from '~/vue_shared/components/icon.vue';
 
   import fileStatusIcon from 'ee/ide/components/repo_file_status_icon.vue';
   import changedFileIcon from 'ee/ide/components/changed_file_icon.vue';
-=======
-  import fileIcon from '~/vue_shared/components/file_icon.vue';
->>>>>>> upstream/master
 
   export default {
     components: {

app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue

@@ -3,10 +3,7 @@
   import pipelineStage from '~/pipelines/components/stage.vue';
   import ciIcon from '~/vue_shared/components/ci_icon.vue';
   import icon from '~/vue_shared/components/icon.vue';
-<<<<<<< HEAD
   import linkedPipelinesMiniList from 'ee/vue_shared/components/linked_pipelines_mini_list.vue';
-=======
->>>>>>> upstream/master
 
   export default {
     name: 'MRWidgetPipeline',

config/webpack.config.js

@@ -325,15 +325,12 @@ var config = {
       'vendor':         path.join(ROOT_PATH, 'vendor/assets/javascripts'),
       'vue$':           'vue/dist/vue.esm.js',
       'spec':           path.join(ROOT_PATH, 'spec/javascripts'),
-<<<<<<< HEAD
 
       // EE-only
       'ee':              path.join(ROOT_PATH, 'ee/app/assets/javascripts'),
       'ee_empty_states': path.join(ROOT_PATH, 'ee/app/views/shared/empty_states'),
       'ee_icons':        path.join(ROOT_PATH, 'ee/app/views/shared/icons'),
       'ee_images':       path.join(ROOT_PATH, 'ee/app/assets/images'),
-=======
->>>>>>> upstream/master
     }
   }
 }

spec/javascripts/environments/environment_table_spec.js

 import Vue from 'vue';
 import environmentTableComp from '~/environments/components/environments_table.vue';
-<<<<<<< HEAD
 import eventHub from '~/environments/event_hub';
 import mountComponent from 'spec/helpers/vue_mount_component_helper';
 import { deployBoardMockData } from './mock_data';
-=======
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
->>>>>>> upstream/master
 
 describe('Environment table', () => {
   let Component;

spec/javascripts/repo/components/repo_commit_section_spec.js

@@ -2,10 +2,7 @@ import Vue from 'vue';
 import store from '~/ide/stores';
 import service from '~/ide/services';
 import repoCommitSection from '~/ide/components/repo_commit_section.vue';
-<<<<<<< HEAD
 import { createComponentWithStore } from 'spec/helpers/vue_mount_component_helper';
-=======
->>>>>>> upstream/master
 import getSetTimeoutPromise from 'spec/helpers/set_timeout_promise_helper';
 import { file, resetStore } from '../helpers';
 

spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js

 import Vue from 'vue';
 import pipelineComponent from '~/vue_merge_request_widget/components/mr_widget_pipeline.vue';
-<<<<<<< HEAD
 import mountComponent from 'spec/helpers/vue_mount_component_helper'; // eslint-disable-line import/first
-=======
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
->>>>>>> upstream/master
 import mockData from '../mock_data';
 import mockLinkedPipelines from 'spec/pipelines/graph/linked_pipelines_mock_data'; // eslint-disable-line import/first