Merge branch 'ce-to-ee-2018-01-26' of https://gitlab.com/gitlab-org/gitlab-ee...

Merge branch 'ce-to-ee-2018-01-26' of https://gitlab.com/gitlab-org/gitlab-ee into ce-to-ee-2018-01-26

* 'ce-to-ee-2018-01-26' of https://gitlab.com/gitlab-org/gitlab-ee:
  Resolve conflict in mr_widget_merge_when_pipeline_succeeds.vue

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue

@@ -84,15 +84,9 @@
     <div class="media-body">
       <h4 class="flex-container-block">
         <span class="append-right-10">
-<<<<<<< HEAD
-          Set by
-          <mr-widget-author :author="mr.setToMWPSBy" />
-          to be merged automatically when the pipeline succeeds
-=======
           {{ s__("mrWidget|Set by") }}
           <mr-widget-author :author="mr.setToMWPSBy" />
           {{ s__("mrWidget|to be merged automatically when the pipeline succeeds") }}
->>>>>>> upstream/master
         </span>
         <a
           v-if="mr.canCancelAutomaticMerge"