Fix Frontend conflicts

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

app/assets/javascripts/notes.js

@@ -1121,13 +1121,8 @@ const normalizeNewlines = function(str) {
       }
     };
 
-<<<<<<< HEAD
-    Notes.animateAppendNote = function(noteHTML, $notesList) {
-      const $note = window.$(noteHTML);
-=======
     Notes.animateAppendNote = function(noteHtml, $notesList) {
       const $note = $(noteHtml);
->>>>>>> upstream/master
 
       $note.addClass('fade-in-full').renderGFM();
       $notesList.append($note);

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js

@@ -67,22 +67,16 @@ export default {
       return Boolean(!commitMessage.length
         || !this.isMergeAllowed()
         || this.isMakingRequest
-<<<<<<< HEAD
         || this.isApprovalNeeded
-=======
->>>>>>> upstream/master
         || this.mr.preventMerge);
     },
     shouldShowSquashBeforeMerge() {
       const { commitsCount, enableSquashBeforeMerge } = this.mr;
       return enableSquashBeforeMerge && commitsCount > 1;
     },
-<<<<<<< HEAD
     isApprovalNeeded() {
       return this.mr.approvalsRequired ? !this.mr.isApproved : false;
     },
-=======
->>>>>>> upstream/master
   },
   methods: {
     isMergeAllowed() {
@@ -273,7 +267,6 @@ export default {
           :mr="mr"
           :is-merge-button-disabled="isMergeButtonDisabled" />
 
-<<<<<<< HEAD
         <span v-if="mr.ffOnlyEnabled">
           Fast-forward merge without a merge commit
         </span>
@@ -287,15 +280,6 @@ export default {
           </button>
         </span>
 
-=======
-        <button
-          @click="toggleCommitMessageEditor"
-          :disabled="isMergeButtonDisabled"
-          class="btn btn-default btn-xs"
-          type="button">
-          Modify commit message
-        </button>
->>>>>>> upstream/master
         <div
           v-if="showCommitMessageEditor"
           class="prepend-top-default commit-message-editor">

app/assets/javascripts/vue_merge_request_widget/dependencies.js

-<<<<<<< HEAD
-=======
 /**
  * This file is the centerpiece of an attempt to reduce potential conflicts
  * between the CE and EE versions of the MR widget. EE additions to the MR widget should
@@ -11,7 +9,6 @@
  * should overwrite import paths **without** changing the order of dependencies listed here.
  */
 
->>>>>>> upstream/master
 export { default as Vue } from 'vue';
 export { default as SmartInterval } from '~/smart_interval';
 export { default as WidgetHeader } from './components/mr_widget_header';
@@ -29,18 +26,13 @@ export { default as ConflictsState } from './components/states/mr_widget_conflic
 export { default as NothingToMergeState } from './components/states/mr_widget_nothing_to_merge';
 export { default as MissingBranchState } from './components/states/mr_widget_missing_branch';
 export { default as NotAllowedState } from './components/states/mr_widget_not_allowed';
-<<<<<<< HEAD
 export { default as ReadyToMergeState } from './ee/components/states/mr_widget_ready_to_merge';
-=======
-export { default as ReadyToMergeState } from './components/states/mr_widget_ready_to_merge';
->>>>>>> upstream/master
 export { default as UnresolvedDiscussionsState } from './components/states/mr_widget_unresolved_discussions';
 export { default as PipelineBlockedState } from './components/states/mr_widget_pipeline_blocked';
 export { default as PipelineFailedState } from './components/states/mr_widget_pipeline_failed';
 export { default as MergeWhenPipelineSucceedsState } from './components/states/mr_widget_merge_when_pipeline_succeeds';
 export { default as AutoMergeFailed } from './components/states/mr_widget_auto_merge_failed';
 export { default as CheckingState } from './components/states/mr_widget_checking';
-<<<<<<< HEAD
 export { default as MRWidgetStore } from './ee/stores/mr_widget_store';
 export { default as MRWidgetService } from './ee/services/mr_widget_service';
 export { default as eventHub } from './event_hub';
@@ -48,12 +40,3 @@ export { default as getStateKey } from './ee/stores/get_state_key';
 export { default as mrWidgetOptions } from './ee/mr_widget_options';
 export { default as stateMaps } from './ee/stores/state_maps';
 export { default as SquashBeforeMerge } from './ee/components/states/mr_widget_squash_before_merge';
-=======
-export { default as MRWidgetStore } from './stores/mr_widget_store';
-export { default as MRWidgetService } from './services/mr_widget_service';
-export { default as eventHub } from './event_hub';
-export { default as getStateKey } from './stores/get_state_key';
-export { default as mrWidgetOptions } from './mr_widget_options';
-export { default as stateMaps } from './stores/state_maps';
-export { default as SquashBeforeMerge } from './components/states/mr_widget_squash_before_merge';
->>>>>>> upstream/master

app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js

@@ -69,11 +69,8 @@ export default {
         ciEnvironmentsStatusPath: store.ciEnvironmentsStatusPath,
         statusPath: store.statusPath,
         mergeActionsContentPath: store.mergeActionsContentPath,
-<<<<<<< HEAD
         rebasePath: store.rebasePath,
         approvalsPath: store.approvalsPath,
-=======
->>>>>>> upstream/master
       };
       return new MRWidgetService(endpoints);
     },

app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js

@@ -11,12 +11,9 @@ export default class MergeRequestStore {
     const currentUser = data.current_user;
     const pipelineStatus = data.pipeline ? data.pipeline.details.status : null;
 
-<<<<<<< HEAD
     // EE specific
     this.squash = data.squash;
 
-=======
->>>>>>> upstream/master
     this.title = data.title;
     this.targetBranch = data.target_branch;
     this.sourceBranch = data.source_branch;

app/assets/stylesheets/framework/lists.scss

@@ -152,16 +152,13 @@ ul.content-list {
         margin-top: 3px;
         margin-bottom: 4px;
 
-<<<<<<< HEAD
         &.btn-ldap-override {
           @media (min-width: $screen-sm-min) {
             margin-bottom: 0;
           }
         }
 
-=======
         &.has-tooltip,
->>>>>>> upstream/master
         &:last-child {
           margin-right: 0;