Resolve conflicts for metadata form and issuable sidebar

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

@@ -20,58 +20,7 @@
         .block.todo.hide-expanded
           = render "shared/issuable/sidebar_todo", todo: todo, issuable: issuable, is_collapsed: true
       .block.assignee
-<<<<<<< HEAD
-        - if issuable.instance_of?(Issue)
-          #js-vue-sidebar-assignees{ data: { field: "#{issuable.to_ability_name}[assignee_ids]" } }
-        - else
-          .sidebar-collapsed-icon.sidebar-collapsed-user{ data: { toggle: "tooltip", placement: "left", container: "body" }, title: (issuable.assignee.name if issuable.assignee) }
-            - if issuable.assignee
-              = link_to_member(@project, issuable.assignee, size: 24)
-            - else
-              = icon('user', 'aria-hidden': 'true')
-          .title.hide-collapsed
-            Assignee
-            = icon('spinner spin', class: 'hidden block-loading', 'aria-hidden': 'true')
-            - if can_edit_issuable
-              = link_to 'Edit', '#', class: 'edit-link pull-right'
-          .value.hide-collapsed
-            - if issuable.assignee
-              = link_to_member(@project, issuable.assignee, size: 32, extra_class: 'bold') do
-                - if issuable.instance_of?(MergeRequest) && !issuable.can_be_merged_by?(issuable.assignee)
-                  %span.pull-right.cannot-be-merged{ data: { toggle: 'tooltip', placement: 'left' }, title: 'Not allowed to merge' }
-                    = icon('exclamation-triangle', 'aria-hidden': 'true')
-                %span.username
-                  = issuable.assignee.to_reference
-            - else
-              %span.assign-yourself.no-value
-                No assignee
-                - if can_edit_issuable
-                  \-
-                  %a.js-assign-yourself{ href: '#' }
-                    assign yourself
-
-        .selectbox.hide-collapsed
-          - issuable.assignees.each do |assignee|
-            = hidden_field_tag "#{issuable.to_ability_name}[assignee_ids][]", assignee.id, id: nil
-
-          - options = { toggle_class: 'js-user-search js-author-search', title: 'Assign to', filter: true, dropdown_class: 'dropdown-menu-user dropdown-menu-selectable dropdown-menu-author', placeholder: 'Search users', data: { first_user: (current_user.username if current_user), current_user: true, project_id: (@project.id if @project), author_id: issuable.author_id, field_name: "#{issuable.to_ability_name}[assignee_id]", issue_update: issuable_json_path(issuable), ability_name: issuable.to_ability_name, null_user: true } }
-
-          - if issuable.instance_of?(Issue)
-            - if issuable.assignees.length == 0
-              = hidden_field_tag "#{issuable.to_ability_name}[assignee_ids][]", 0, id: nil
-            - title = 'Select assignee(s)'
-            - options[:toggle_class] += ' js-multiselect js-save-user-data'
-            - options[:data][:field_name] = "#{issuable.to_ability_name}[assignee_ids][]"
-            - options[:data][:multi_select] = true
-            - options[:data]['dropdown-title'] = title
-            - options[:data]['dropdown-header'] = 'Assignee(s)'
-          - else
-            - title = 'Select assignee'
-
-          = dropdown_tag(title, options: options)
-=======
         = render "shared/issuable/sidebar_assignees", issuable: issuable, can_edit_issuable: can_edit_issuable
->>>>>>> upstream/master
       .block.milestone
         .sidebar-collapsed-icon
           = icon('clock-o', 'aria-hidden': 'true')

app/views/shared/issuable/form/_metadata.html.haml

@@ -11,21 +11,7 @@
   %div{ class: (has_due_date ? "col-lg-6" : "col-sm-12") }
     .form-group.issue-assignee
       - if issuable.is_a?(Issue)
-<<<<<<< HEAD
-        = form.label :assignee_ids, "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.selectbox
-            - issuable.assignees.each do |assignee|
-              = hidden_field_tag "#{issuable.to_ability_name}[assignee_ids][]", assignee.id, id: nil, data: { meta: assignee.name }
-
-            - if issuable.assignees.length === 0
-              = hidden_field_tag "#{issuable.to_ability_name}[assignee_ids][]", 0, id: nil, data: { meta: '' }
-
-            = dropdown_tag(users_dropdown_label(issuable.assignees), options: issue_dropdown_options(issuable, true))
-          = link_to 'Assign to me', '#', class: "assign-to-me-link #{'hide' if issuable.assignees.include?(current_user)}"
-=======
         = render "shared/issuable/form/metadata_issue_assignee", issuable: issuable, form: form, has_due_date: has_due_date
->>>>>>> upstream/master
       - else
         = render "shared/issuable/form/metadata_merge_request_assignee", issuable: issuable, form: form, has_due_date: has_due_date
     .form-group.issue-milestone