Fixed UserPopover Conflicts

app/assets/javascripts/main.js

@@ -31,12 +31,9 @@ import initPerformanceBar from './performance_bar';
 import initSearchAutocomplete from './search_autocomplete';
 import GlFieldErrors from './gl_field_errors';
 import initUserPopovers from './user_popovers';
-<<<<<<< HEAD
 
 // EE-only scripts
 import 'ee/main';
-=======
->>>>>>> upstream/master
 
 // expose jQuery as global (TODO: remove these)
 window.jQuery = jQuery;

app/assets/javascripts/notes/components/note_header.vue

@@ -81,10 +81,7 @@ export default {
       :data-user-id="author.id"
       :data-username="author.username"
     >
-<<<<<<< HEAD
       <slot name="note-header-info"></slot>
-=======
->>>>>>> upstream/master
       <span class="note-header-author-name">{{ author.name }}</span>
       <span v-if="author.status_tooltip_html" v-html="author.status_tooltip_html"></span>
       <span class="note-headline-light">@{{ author.username }}</span>

app/assets/javascripts/user_popovers.js

@@ -47,10 +47,7 @@ const handleUserPopoverMouseOver = event => {
       bio: null,
       organization: null,
       status: null,
-<<<<<<< HEAD
-=======
       loaded: false,
->>>>>>> upstream/master
     };
     if (userId || username) {
       const UserPopoverComponent = Vue.extend(UserPopover);
@@ -98,22 +95,11 @@ const handleUserPopoverMouseOver = event => {
           renderedPopover = null;
         });
     }
-<<<<<<< HEAD
-  }, 200);
-};
-
-export default elements => {
-  let userLinks = elements;
-  if (!elements) {
-    userLinks = [...document.querySelectorAll('.js-user-link')];
-  }
-=======
   }, 200); // 200ms delay so not every mouseover triggers Popover + API Call
 };
 
 export default elements => {
   const userLinks = elements || [...document.querySelectorAll('.js-user-link')];
->>>>>>> upstream/master
 
   userLinks.forEach(el => {
     el.addEventListener('mouseenter', handleUserPopoverMouseOver);

app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue

@@ -53,17 +53,10 @@ export default {
       return !this.user.name;
     },
     jobInfoIsLoading() {
-<<<<<<< HEAD
-      return !this.loaded && this.user.organization === null;
-    },
-    locationIsLoading() {
-      return !this.loaded && this.user.location === null;
-=======
       return !this.user.loaded && this.user.organization === null;
     },
     locationIsLoading() {
       return !this.user.loaded && this.user.location === null;
->>>>>>> upstream/master
     },
   },
 };

spec/javascripts/api_spec.js

@@ -333,7 +333,6 @@ describe('Api', () => {
     });
   });
 
-<<<<<<< HEAD
   describe('ldap_groups', () => {
     it('calls callback on completion', done => {
       const query = 'query';
@@ -356,8 +355,6 @@ describe('Api', () => {
     });
   });
 
-=======
->>>>>>> upstream/master
   describe('user', () => {
     it('fetches single user', done => {
       const userId = '123456';

spec/javascripts/user_popovers_spec.js

@@ -48,11 +48,7 @@ describe('User Popovers', () => {
         expect(document.querySelector('.popover')).toBeNull();
         done();
       });
-<<<<<<< HEAD
-    }, 210);
-=======
     }, 210); // We need to wait until the 200ms mouseover delay is over, only then the popover will be visible
->>>>>>> upstream/master
   });
 
   it('Should Not show a popover on short mouse over', done => {