CE->EE: fix upstream merge conflicts

app/assets/javascripts/repo/components/repo_edit_button.vue

@@ -34,17 +34,7 @@ export default {
 
   watch: {
     editMode() {
-<<<<<<< HEAD
-      if (this.editMode) {
-        $('.project-refs-form').addClass('disabled');
-        $('.js-tree-ref-target-holder').show();
-      } else {
-        $('.project-refs-form').removeClass('disabled');
-        $('.js-tree-ref-target-holder').hide();
-      }
-=======
       this.toggleProjectRefsForm();
->>>>>>> upstream/master
     },
   },
 };

app/assets/javascripts/repo/components/repo_sidebar.vue

@@ -35,11 +35,7 @@ export default {
 
     fileClicked(clickedFile) {
       let file = clickedFile;
-<<<<<<< HEAD
-
-=======
       if (file.loading) return;
->>>>>>> upstream/master
       file.loading = true;
       if (file.type === 'tree' && file.opened) {
         file = Store.removeChildFilesOfTree(file);

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

@@ -39,19 +39,11 @@ export default RepoTab;
 </script>
 
 <template>
-<<<<<<< HEAD
-<li>
-  <a
-    href="#0"
-    class="close"
-    @click.prevent="xClicked(tab)"
-=======
 <li @click="tabClicked(tab)">
   <a
     href="#0"
     class="close"
     @click.stop.prevent="closeTab(tab)"
->>>>>>> upstream/master
     :aria-label="closeLabel">
     <i
       class="fa"

app/assets/javascripts/repo/components/repo_tabs.vue

@@ -13,11 +13,7 @@ const RepoTabs = {
   data: () => Store,
 
   methods: {
-<<<<<<< HEAD
-    xClicked(file) {
-=======
     tabClosed(file) {
->>>>>>> upstream/master
       Store.removeFromOpenedFiles(file);
     },
   },
@@ -27,12 +23,6 @@ export default RepoTabs;
 </script>
 
 <template>
-<<<<<<< HEAD
-<ul
-  v-if="isMini"
-  id="tabs">
-  <repo-tab v-for="tab in openedFiles" :key="tab.id" :tab="tab" :class="{'active' : tab.active}" @xclicked="xClicked"/>
-=======
 <ul id="tabs">
   <repo-tab
     v-for="tab in openedFiles"
@@ -41,7 +31,6 @@ export default RepoTabs;
     :class="{'active' : tab.active}"
     @tabclosed="tabClosed"
   />
->>>>>>> upstream/master
   <li class="tabs-divider" />
 </ul>
 </template>

app/assets/javascripts/repo/helpers/repo_helper.js

@@ -37,13 +37,6 @@ const RepoHelper = {
 
   getFileExtension(fileName) {
     return fileName.split('.').pop();
-<<<<<<< HEAD
-  },
-
-  getBranch() {
-    return $('button.dropdown-menu-toggle').attr('data-ref');
-=======
->>>>>>> upstream/master
   },
 
   getLanguageIDForFile(file, langs) {
@@ -142,10 +135,6 @@ const RepoHelper = {
     return Service.getContent()
     .then((response) => {
       const data = response.data;
-<<<<<<< HEAD
-      // RepoHelper.setLoading(false, loadingData);
-=======
->>>>>>> upstream/master
       Store.isTree = RepoHelper.isTree(data);
       if (!Store.isTree) {
         if (!file) file = data;

app/assets/javascripts/repo/stores/repo_store.js

@@ -6,11 +6,8 @@ const RepoStore = {
   monaco: {},
   monacoLoading: false,
   service: '',
-<<<<<<< HEAD
-=======
   canCommit: false,
   onTopOfBranch: false,
->>>>>>> upstream/master
   editMode: false,
   isTree: false,
   isRoot: false,

spec/javascripts/repo/components/repo_tabs_spec.js

@@ -29,17 +29,6 @@ describe('RepoTabs', () => {
     expect(tabs[2].classList.contains('tabs-divider')).toBeTruthy();
   });
 
-<<<<<<< HEAD
-  it('does not render a tabs list if not isMini', () => {
-    RepoStore.openedFiles = [];
-
-    const vm = createComponent();
-
-    expect(vm.$el.innerHTML).toBeFalsy();
-  });
-
-=======
->>>>>>> upstream/master
   describe('methods', () => {
     describe('tabClosed', () => {
       it('calls removeFromOpenedFiles with file obj', () => {