Resolve view conflicts

app/views/admin/users/index.html.haml

@@ -3,40 +3,6 @@
 = render "admin/dashboard/head"
 
 %div{ class: container_class }
-<<<<<<< HEAD
-  .top-area
-    .prepend-top-default
-      = form_tag admin_users_path, method: :get do
-        - if params[:filter].present?
-          = hidden_field_tag "filter", h(params[:filter])
-        .search-holder
-          .search-field-holder
-            = search_field_tag :search_query, params[:search_query], placeholder: 'Search by name, email or username', class: 'form-control search-text-input js-search-input', spellcheck: false
-            = icon("search", class: "search-icon")
-          .dropdown
-            - toggle_text = if @sort.present? then sort_options_hash[@sort] else sort_title_name end
-            = dropdown_toggle(toggle_text, { toggle: 'dropdown' })
-            %ul.dropdown-menu.dropdown-menu-align-right
-              %li.dropdown-header
-                Sort by
-              %li
-                = link_to admin_users_path(sort: sort_value_name, filter: params[:filter]) do
-                  = sort_title_name
-                = link_to admin_users_path(sort: sort_value_recently_signin, filter: params[:filter]) do
-                  = sort_title_recently_signin
-                = link_to admin_users_path(sort: sort_value_oldest_signin, filter: params[:filter]) do
-                  = sort_title_oldest_signin
-                = link_to admin_users_path(sort: sort_value_recently_created, filter: params[:filter]) do
-                  = sort_title_recently_created
-                = link_to admin_users_path(sort: sort_value_oldest_created, filter: params[:filter]) do
-                  = sort_title_oldest_created
-                = link_to admin_users_path(sort: sort_value_recently_updated, filter: params[:filter]) do
-                  = sort_title_recently_updated
-                = link_to admin_users_path(sort: sort_value_oldest_updated, filter: params[:filter]) do
-                  = sort_title_oldest_updated
-          = link_to 'Send email to users', admin_email_path, class: 'btn'
-          = link_to 'New user', new_admin_user_path, class: 'btn btn-new btn-search'
-=======
   .prepend-top-default
     = form_tag admin_users_path, method: :get do
       - if params[:filter].present?
@@ -66,8 +32,8 @@
                 = sort_title_recently_updated
               = link_to admin_users_path(sort: sort_value_oldest_updated, filter: params[:filter]) do
                 = sort_title_oldest_updated
+        = link_to 'Send email to users', admin_email_path, class: 'btn'
         = link_to 'New user', new_admin_user_path, class: 'btn btn-new btn-search'
->>>>>>> ce/master
 
     .top-area.scrolling-tabs-container.inner-page-scroll-tabs
       .fade-left

app/views/shared/_field.html.haml

@@ -13,21 +13,15 @@
   - else
     = form.label name, title, class: "control-label"
   .col-sm-10
-    - case type
-    - when 'text'
+    - if type == 'text'
       = form.text_field name, class: "form-control", placeholder: placeholder
-    - when 'textarea'
+    - elsif type == 'textarea'
       = form.text_area name, rows: 5, class: "form-control", placeholder: placeholder
-    - when 'checkbox'
+    - elsif type == 'checkbox'
       = form.check_box name
-    - when 'select'
+    - elsif type == 'select'
       = form.select name, options_for_select(choices, value ? value : default_choice), {}, { class: "form-control" }
-<<<<<<< HEAD
-    - when 'password'
-      = form.password_field name, autocomplete: "new-password", class: 'form-control'
-=======
     - elsif type == 'password'
       = form.password_field name, autocomplete: "new-password", class: "form-control"
->>>>>>> ce/master
     - if help
       %span.help-block= help

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

@@ -74,27 +74,6 @@
                         {{name}}
                       %span.dropdown-light-content
                         @{{username}}
-<<<<<<< HEAD
-
-            - unless board && board.milestone_id
-              #js-dropdown-milestone.filtered-search-input-dropdown-menu.dropdown-menu
-                %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}}
-
-=======
             #js-dropdown-milestone.filtered-search-input-dropdown-menu.dropdown-menu
               %ul{ data: { dropdown: true } }
                 %li.filter-dropdown-item{ data: { value: 'none' } }
@@ -111,7 +90,6 @@
                 %li.filter-dropdown-item
                   %button.btn.btn-link.js-data-value
                     {{title}}
->>>>>>> ce/master
             #js-dropdown-label.filtered-search-input-dropdown-menu.dropdown-menu
               %ul{ data: { dropdown: true } }
                 %li.filter-dropdown-item{ data: { value: 'none' } }