resolve mr widget conflicts

app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js

@@ -72,20 +72,12 @@ export default {
         <a
           href="#modal_merge_info"
           data-toggle="modal"
-<<<<<<< HEAD
-          class="btn inline btn-grouped">
-=======
           class="btn btn-small inline">
->>>>>>> upstream/master
           Check out branch
         </a>
         <span class="dropdown inline prepend-left-10">
           <a
-<<<<<<< HEAD
-            class="btn dropdown-toggle"
-=======
             class="btn btn-xs dropdown-toggle"
->>>>>>> upstream/master
             data-toggle="dropdown"
             aria-label="Download as"
             role="button">

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

@@ -72,7 +72,6 @@ export default {
             </span>
             <span class="mr-widget-pipeline-graph">
               <span class="stage-cell">
-<<<<<<< HEAD
                 <linked-pipelines-mini-list
                   v-if="triggeredBy.length"
                   :triggered-by="triggeredBy"
@@ -92,14 +91,6 @@ export default {
                   v-if="triggered.length"
                   :triggered="triggered"
                   />
-=======
-                <div
-                  v-if="mr.pipeline.details.stages.length > 0"
-                  v-for="stage in mr.pipeline.details.stages"
-                  class="stage-container dropdown js-mini-pipeline-graph">
-                  <pipeline-stage :stage="stage" />
-                </div>
->>>>>>> upstream/master
               </span>
             </span>
             <span>

app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.js

@@ -2,32 +2,18 @@ export default {
   name: 'MRWidgetRelatedLinks',
   props: {
     relatedLinks: { type: Object, required: true },
-<<<<<<< HEAD
-    state: { type: String },
-=======
     state: { type: String, required: false },
->>>>>>> upstream/master
   },
   computed: {
     hasLinks() {
       const { closing, mentioned, assignToMe } = this.relatedLinks;
       return closing || mentioned || assignToMe;
     },
-<<<<<<< HEAD
-  },
-  methods: {
-    closesText(state) {
-      if (state === 'merged') {
-        return 'Closed';
-      }
-      if (state === 'closed') {
-=======
     closesText() {
       if (this.state === 'merged') {
         return 'Closed';
       }
       if (this.state === 'closed') {
->>>>>>> upstream/master
         return 'Did not close';
       }
       return 'Closes';
@@ -38,11 +24,7 @@ export default {
       v-if="hasLinks"
       class="mr-info-list mr-links">
       <p v-if="relatedLinks.closing">
-<<<<<<< HEAD
-        {{closesText(state)}} <span v-html="relatedLinks.closing"></span>
-=======
         {{closesText}} <span v-html="relatedLinks.closing"></span>
->>>>>>> upstream/master
       </p>
       <p v-if="relatedLinks.mentioned">
         Mentions <span v-html="relatedLinks.mentioned"></span>

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

@@ -15,11 +15,7 @@ export default {
         <span class="bold">
           There are merge conflicts<span v-if="!mr.canMerge">.</span>
           <span v-if="!mr.canMerge">
-<<<<<<< HEAD
-            Resolve these conflicts or ask someone with write access to this repository to merge it locally.
-=======
             Resolve these conflicts or ask someone with write access to this repository to merge it locally
->>>>>>> upstream/master
           </span>
         </span>
         <a

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

 /* global Flash */
 
 import mrWidgetAuthorTime from '../../components/mr_widget_author_time';
-<<<<<<< HEAD
-=======
 import tooltip from '../../../vue_shared/directives/tooltip';
 import loadingIcon from '../../../vue_shared/components/loading_icon.vue';
->>>>>>> upstream/master
 import statusIcon from '../mr_widget_status_icon';
 import eventHub from '../../event_hub';
 
@@ -15,13 +12,6 @@ export default {
     mr: { type: Object, required: true },
     service: { type: Object, required: true },
   },
-<<<<<<< HEAD
-  components: {
-    'mr-widget-author-and-time': mrWidgetAuthorTime,
-    statusIcon,
-  },
-=======
->>>>>>> upstream/master
   data() {
     return {
       isMakingRequest: false,
@@ -84,12 +74,8 @@ export default {
             :dateReadable="mr.mergedAt" />
           <a
             v-if="mr.canRevertInCurrentMR"
-<<<<<<< HEAD
-            class="btn btn-close btn-xs has-tooltip"
-=======
             v-tooltip
             class="btn btn-close btn-xs"
->>>>>>> upstream/master
             href="#modal-revert-commit"
             data-toggle="modal"
             data-container="body"
@@ -98,12 +84,8 @@ export default {
           </a>
           <a
             v-else-if="mr.revertInForkPath"
-<<<<<<< HEAD
-            class="btn btn-close btn-xs has-tooltip"
-=======
             v-tooltip
             class="btn btn-close btn-xs"
->>>>>>> upstream/master
             data-method="post"
             :href="mr.revertInForkPath"
             title="Revert this merge request in a new merge request">
@@ -111,12 +93,8 @@ export default {
           </a>
           <a
             v-if="mr.canCherryPickInCurrentMR"
-<<<<<<< HEAD
-            class="btn btn-default btn-xs has-tooltip"
-=======
             v-tooltip
             class="btn btn-default btn-xs"
->>>>>>> upstream/master
             href="#modal-cherry-pick-commit"
             data-toggle="modal"
             data-container="body"
@@ -125,12 +103,8 @@ export default {
           </a>
           <a
             v-else-if="mr.cherryPickInForkPath"
-<<<<<<< HEAD
-            class="btn btn-default btn-xs has-tooltip"
-=======
             v-tooltip
             class="btn btn-default btn-xs"
->>>>>>> upstream/master
             data-method="post"
             :href="mr.cherryPickInForkPath"
             title="Cherry-pick this merge request in a new merge request">
@@ -149,22 +123,14 @@ export default {
             <span>You can remove source branch now</span>
             <button
               @click="removeSourceBranch"
-<<<<<<< HEAD
-              :class="{ disabled: isMakingRequest }"
-=======
               :disabled="isMakingRequest"
->>>>>>> upstream/master
               type="button"
               class="btn btn-xs btn-default js-remove-branch-button">
               Remove Source Branch
             </button>
           </p>
           <p v-if="shouldShowSourceBranchRemoving">
-<<<<<<< HEAD
-            <status-icon status="loading" />
-=======
             <loading-icon inline />
->>>>>>> upstream/master
             <span>The source branch is being removed</span>
           </p>
         </section>

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

 import statusIcon from '../mr_widget_status_icon';
-<<<<<<< HEAD
-=======
 import tooltip from '../../../vue_shared/directives/tooltip';
->>>>>>> upstream/master
 import mrWidgetMergeHelp from '../../components/mr_widget_merge_help';
 
 export default {
@@ -35,15 +32,10 @@ export default {
           </span> branch does not exist.
           Please restore it or use a different {{missingBranchName}} branch
           <i
-<<<<<<< HEAD
-            class="fa fa-question-circle has-tooltip"
-            :title="message" />
-=======
             v-tooltip
             class="fa fa-question-circle"
             :title="message"
             :aria-label="message"></i>
->>>>>>> upstream/master
         </span>
       </div>
     </div>

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

@@ -280,7 +280,6 @@ export default {
                 :mr="mr"
                 :is-merge-button-disabled="isMergeButtonDisabled" />
 
-<<<<<<< HEAD
               <span v-if="mr.ffOnlyEnabled">
                 Fast-forward merge without a merge commit
               </span>
@@ -293,15 +292,6 @@ export default {
                   Modify commit message
                 </button>
               </span>
-=======
-              <button
-                @click="toggleCommitMessageEditor"
-                :disabled="isMergeButtonDisabled"
-                class="btn btn-default btn-xs"
-                type="button">
-                Modify commit message
-              </button>
->>>>>>> upstream/master
             </template>
             <template v-else>
               <span class="bold">

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

 /* global Flash */
 import statusIcon from '../mr_widget_status_icon';
-<<<<<<< HEAD
-=======
 import tooltip from '../../../vue_shared/directives/tooltip';
->>>>>>> upstream/master
 import eventHub from '../../event_hub';
 
 export default {
@@ -20,9 +17,6 @@ export default {
       isMakingRequest: false,
     };
   },
-  components: {
-    statusIcon,
-  },
   methods: {
     removeWIP() {
       this.isMakingRequest = true;
@@ -49,16 +43,11 @@ export default {
         <span class="bold">
           This is a Work in Progress
           <i
-<<<<<<< HEAD
-            class="fa fa-question-circle has-tooltip"
-            title="When this merge request is ready, remove the WIP: prefix from the title to allow it to be merged." />
-=======
             v-tooltip
             class="fa fa-question-circle"
             title="When this merge request is ready, remove the WIP: prefix from the title to allow it to be merged"
             aria-label="When this merge request is ready, remove the WIP: prefix from the title to allow it to be merged">
            </i>
->>>>>>> upstream/master
         </span>
         <button
           v-if="mr.removeWIPPath"

app/assets/stylesheets/framework/variables.scss

@@ -208,14 +208,10 @@ $general-hover-transition-curve: linear;
 $highlight-changes-color: rgb(235, 255, 232);
 $performance-bar-height: 35px;
 
-<<<<<<< HEAD
 $issue-box-upcoming-bg: #8f8f8f;
 $pages-group-name-color: #4c4e54;
 $ldap-members-override-bg: $orange-50;
 
-
-=======
->>>>>>> upstream/master
 /*
 * Common component specific colors
 */

app/assets/stylesheets/pages/merge_requests.scss

@@ -500,20 +500,7 @@ $status-icon-margin: $gl-btn-padding;
   align-items: center;
   background-color: $gray-light;
   border-radius: $border-radius-default $border-radius-default 0 0;
-<<<<<<< HEAD
-  padding: $gl-padding-top $gl-padding;
-
-  .pull-right {
-    margin-top: -2px;
-  }
-
-  .btn-clipboard {
-    margin-left: 0;
-    padding-left: 0;
-  }
-=======
   padding: $gl-padding / 2 $gl-padding;
->>>>>>> upstream/master
 
   .dropdown-toggle .fa {
     color: $gl-text-color;

spec/javascripts/vue_mr_widget/components/mr_widget_related_links_spec.js

@@ -45,30 +45,6 @@ describe('MRWidgetRelatedLinks', () => {
         expect(vm.hasLinks).toBeFalsy();
       });
     });
-<<<<<<< HEAD
-  });
-
-  describe('methods', () => {
-    const data = {
-      relatedLinks: {
-        closing: '<a href="#">#23</a> and <a>#42</a>',
-        mentioned: '<a href="#">#7</a>',
-      },
-    };
-    const vm = createComponent(data);
-
-    describe('closesText', () => {
-      it('returns correct text for open merge request', () => {
-        expect(vm.closesText('open')).toEqual('Closes');
-      });
-
-      it('returns correct text for closed merge request', () => {
-        expect(vm.closesText('closed')).toEqual('Did not close');
-      });
-
-      it('returns correct tense for merged request', () => {
-        expect(vm.closesText('merged')).toEqual('Closed');
-=======
 
     describe('closesText', () => {
       it('returns correct text for open merge request', () => {
@@ -87,7 +63,6 @@ describe('MRWidgetRelatedLinks', () => {
         data.state = 'merged';
         const vm = createComponent(data);
         expect(vm.closesText).toEqual('Closed');
->>>>>>> upstream/master
       });
     });
   });