Last conflict resolution

app/assets/stylesheets/framework/filters.scss

@@ -446,15 +446,8 @@
   }
 }
 
-<<<<<<< HEAD
-.filter-dropdown-item.droplab-item-active {
-  .btn {
-    @extend %filter-dropdown-item-btn-hover;
-  }
-=======
 .filter-dropdown-item.droplab-item-active .btn {
   @extend %filter-dropdown-item-btn-hover;
->>>>>>> 9-1-stable
 }
 
 .filter-dropdown-loading {

app/views/notify/new_merge_request_email.html.haml

@@ -8,13 +8,10 @@
 - if @merge_request.assignee_id.present?
   %p
     Assignee: #{@merge_request.assignee_name}
-<<<<<<< HEAD
 
 - if @merge_request.approvers.any?
   %p
     Approvers: #{render_items_list(@merge_request.approvers_left.map(&:name))}
-=======
->>>>>>> 9-1-stable
 
 - if @merge_request.description
   %div

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

@@ -31,11 +31,7 @@
               = icon('filter')
               %button.clear-search.hidden{ type: 'button' }
                 = icon('times')
-<<<<<<< HEAD
-            #js-dropdown-hint.filtered-search-input-dropdown-menu.filtered-search-input-dropdown-menu.dropdown-menu.hint-dropdown
-=======
             #js-dropdown-hint.filtered-search-input-dropdown-menu.dropdown-menu.hint-dropdown
->>>>>>> 9-1-stable
               %ul{ data: { dropdown: true } }
                 %li.filter-dropdown-item{ data: { action: 'submit' } }
                   %button.btn.btn-link
@@ -77,7 +73,6 @@
                         {{name}}
                       %span.dropdown-light-content
                         @{{username}}
-<<<<<<< HEAD
             - unless board && board.milestone_id
               #js-dropdown-milestone.filtered-search-input-dropdown-menu.dropdown-menu{ data: { icon: 'clock-o', hint: 'milestone', tag: '%milestone' } }
                 %ul{ data: { dropdown: true } }
@@ -95,24 +90,6 @@
                   %li.filter-dropdown-item
                     %button.btn.btn-link.js-data-value
                       {{title}}
-=======
-            #js-dropdown-milestone.filtered-search-input-dropdown-menu.dropdown-menu{ data: { icon: 'clock-o', hint: 'milestone', tag: '%milestone' } }
-              %ul{ data: { dropdown: true } }
-                %li.filter-dropdown-item{ data: { value: 'none' } }
-                  %button.btn.btn-link
-                    No Milestone
-                %li.filter-dropdown-item{ data: { value: 'upcoming' } }
-                  %button.btn.btn-link
-                    Upcoming
-                %li.filter-dropdown-item{ 'data-value' => 'started' }
-                  %button.btn.btn-link
-                    Started
-                %li.divider
-              %ul.filter-dropdown{ data: { dynamic: true, dropdown: true } }
-                %li.filter-dropdown-item
-                  %button.btn.btn-link.js-data-value
-                    {{title}}
->>>>>>> 9-1-stable
             #js-dropdown-label.filtered-search-input-dropdown-menu.dropdown-menu{ data: { icon: 'tag', hint: 'label', tag: '~label', type: 'array' } }
               %ul{ data: { dropdown: true } }
                 %li.filter-dropdown-item{ data: { value: 'none' } }
@@ -125,7 +102,6 @@
                     %span.dropdown-label-box{ style: 'background: {{color}}' }
                     %span.label-title.js-data-value
                       {{title}}
-<<<<<<< HEAD
 
             - if type == :issues || type == :boards
               #js-dropdown-weight.filtered-search-input-dropdown-menu.dropdown-menu{ data: { icon: 'balance-scale', hint: 'weight', tag: 'weight' } }
@@ -142,8 +118,6 @@
                     %li.filter-dropdown-item{ 'data-value' => "#{weight}" }
                       %button.btn.btn-link= weight
 
-=======
->>>>>>> 9-1-stable
         .filter-dropdown-container
           - if type == :boards
             - if can?(current_user, :admin_list, @project)

spec/features/issues/filtered_search/search_bar_spec.rb

@@ -101,11 +101,7 @@ describe 'Search bar', js: true, feature: true do
       find('.filtered-search-box .clear-search').click
       filtered_search.click
 
-<<<<<<< HEAD
-      expect(find('#js-dropdown-hint')).to have_selector('.filter-dropdown .filter-dropdown-item', count: 5)
-=======
       expect(find('#js-dropdown-hint')).to have_selector('.filter-dropdown .filter-dropdown-item', count: 4)
->>>>>>> 9-1-stable
       expect(get_left_style(find('#js-dropdown-hint')['style'])).to eq(hint_offset)
     end
   end