Fix conflicts in issuable/_form

app/views/shared/issuable/_form.html.haml

@@ -52,37 +52,6 @@
         = f.label :assignee_id, "Assignee", class: "control-label #{"col-lg-4" if has_due_date}"
         .col-sm-10{ class: ("col-lg-8" if has_due_date) }
           .issuable-form-select-holder
-<<<<<<< HEAD
-            = f.select(:milestone_id, milestone_options(issuable),
-              { include_blank: true }, { class: 'select2', data: { placeholder: 'Select milestone' } })
-        - else
-          .prepend-top-10
-          %span.light No open milestones available.
-        &nbsp;
-        - if can? current_user, :admin_milestone, issuable.project
-          = link_to 'Create new milestone', new_namespace_project_milestone_path(issuable.project.namespace, issuable.project), target: :blank
-  - if issuable.respond_to?(:weight)
-    .form-group
-      = f.label :label_ids, class: 'control-label' do
-        Weight
-      .col-sm-10
-        = f.select :weight, issues_weight_options(issuable.weight, edit: true), { include_blank: true },
-          { class: 'select2 js-select2', data: { placeholder: "Select weight" }}
-
-  .form-group
-    - has_labels = issuable.project.labels.any?
-    = f.label :label_ids, "Labels", class: 'control-label'
-    .col-sm-10{ class: ('issuable-form-padding-top' if !has_labels) }
-      - if has_labels
-        .issuable-form-select-holder
-          = f.collection_select :label_ids, issuable.project.labels.all, :id, :name,
-            { selected: issuable.label_ids }, multiple: true, class: 'select2', data: { placeholder: "Select labels" }
-      - else
-        %span.light No labels yet.
-      &nbsp;
-      - if can? current_user, :admin_label, issuable.project
-        = link_to 'Create new label', new_namespace_project_label_path(issuable.project.namespace, issuable.project), target: :blank
-=======
             = users_select_tag("#{issuable.class.model_name.param_key}[assignee_id]",
                 placeholder: 'Select assignee', class: 'custom-form-control', null_user: true,
                 selected: issuable.assignee_id, project: @target_project || @project,
@@ -102,6 +71,13 @@
           - if can? current_user, :admin_milestone, issuable.project
             %div
               = link_to 'Create new milestone', new_namespace_project_milestone_path(issuable.project.namespace, issuable.project), target: :blank, class: "prepend-top-5 inline"
+      - if issuable.respond_to?(:weight)
+        .form-group
+          = f.label :label_ids, class: "control-label #{"col-lg-4" if has_due_date}" do
+            Weight
+          .col-sm-10{ class: ("col-lg-8" if has_due_date) }
+            = f.select :weight, issues_weight_options(issuable.weight, edit: true), { include_blank: true },
+              { class: 'select2 js-select2', data: { placeholder: "Select weight" }}
       .form-group
         - has_labels = issuable.project.labels.any?
         = f.label :label_ids, "Labels", class: "control-label #{"col-lg-4" if has_due_date}"
@@ -122,7 +98,6 @@
           = f.hidden_field :due_date, id: "issuable-due-date"
           .col-sm-10
             .datepicker
->>>>>>> e6389dfee621090706d43d3107339934ca42f0ff
 
 - if issuable.can_move?(current_user)
   %hr