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


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39

export default {
  name: 'MRWidgetConflicts',
  props: {
    mr: { type: Object, required: true },
  },
  template: `
    <div class="mr-widget-body">
      <button
        type="button"
        class="btn btn-success btn-small"
        disabled="true">
        Merge
      </button>
      <span class="bold">
        There are merge conflicts.
        <span v-if="!mr.canMerge">
          Resolve these conflicts or ask someone with write access to this repository to merge it locally.
        </span>
      </span>
      <div
        v-if="mr.canMerge"
        class="btn-group">
        <a
          v-if="mr.conflictResolutionPath"
          :href="mr.conflictResolutionPath"
          class="btn btn-default btn-xs js-resolve-conflicts-button">
          Resolve conflicts
        </a>
        <a
          v-if="mr.canMerge"
          class="btn btn-default btn-xs js-merge-locally-button"
          data-toggle="modal"
          href="#modal_merge_info">
          Merge locally
        </a>
      </div>
    </div>
  `,
};