Fix conflicts in app/models/user.rb,...

Fix conflicts in app/models/user.rb, app/services/ci/create_pipeline_service.rb, and spec/features/issues/form_spec.rb

app/models/user.rb

@@ -10,12 +10,9 @@ class User < ActiveRecord::Base
   include Sortable
   include CaseSensitivity
   include TokenAuthenticatable
-<<<<<<< HEAD
+  include IgnorableColumn
   prepend EE::GeoAwareAvatar
   prepend EE::User
-=======
-  include IgnorableColumn
->>>>>>> upstream/master
 
   DEFAULT_NOTIFICATION_LEVEL = :participating
 

app/services/ci/create_pipeline_service.rb

@@ -2,11 +2,7 @@ module Ci
   class CreatePipelineService < BaseService
     attr_reader :pipeline
 
-<<<<<<< HEAD
-    def execute(ignore_skip_ci: false, save_on_errors: true, trigger_request: nil, schedule: nil, mirror_update: false)
-=======
-    def execute(source, ignore_skip_ci: false, save_on_errors: true, trigger_request: nil, schedule: nil)
->>>>>>> upstream/master
+    def execute(source, ignore_skip_ci: false, save_on_errors: true, trigger_request: nil, schedule: nil, mirror_update: false)
       @pipeline = Ci::Pipeline.new(
         source: source,
         project: project,
@@ -74,10 +70,6 @@ module Ci
       pipeline.tap(&:process!)
     end
 
-<<<<<<< HEAD
-=======
-    private
-
     def update_merge_requests_head_pipeline
       return unless pipeline.latest?
 
@@ -85,7 +77,6 @@ module Ci
         update_all(head_pipeline_id: @pipeline.id)
     end
 
->>>>>>> upstream/master
     def skip_ci?
       return false unless pipeline.git_commit_message
       pipeline.git_commit_message =~ /\[(ci[ _-]skip|skip[ _-]ci)\]/i

spec/features/issues/form_spec.rb

@@ -24,69 +24,7 @@ describe 'New/edit issue', :feature, :js do
       visit new_namespace_project_issue_path(project.namespace, project)
     end
 
-    describe 'shorten users API pagination limit' do
-<<<<<<< HEAD
-=======
-      before do
-        allow_any_instance_of(FormHelper).to receive(:issue_dropdown_options).and_wrap_original do |original, *args|
-          has_multiple_assignees = *args[1]
-
-          options = {
-            toggle_class: 'js-user-search js-assignee-search js-multiselect js-save-user-data',
-            title: 'Select assignee',
-            filter: true,
-            dropdown_class: 'dropdown-menu-user dropdown-menu-selectable dropdown-menu-assignee',
-            placeholder: 'Search users',
-            data: {
-              per_page: 1,
-              null_user: true,
-              current_user: true,
-              project_id: project.try(:id),
-              field_name: "issue[assignee_ids][]",
-              default_label: 'Assignee',
-              'max-select': 1,
-              'dropdown-header': 'Assignee',
-              multi_select: true,
-              'input-meta': 'name',
-              'always-show-selectbox': true
-            }
-          }
-
-          if has_multiple_assignees
-            options[:title] = 'Select assignee(s)'
-            options[:data][:'dropdown-header'] = 'Assignee(s)'
-            options[:data].delete(:'max-select')
-          end
-
-          options
-        end
-
-        visit new_namespace_project_issue_path(project.namespace, project)
-
-        click_button 'Unassigned'
-
-        wait_for_requests
-      end
-
-      it 'should display selected users even if they are not part of the original API call' do
-        find('.dropdown-input-field').native.send_keys user2.name
-
-        page.within '.dropdown-menu-user' do
-          expect(page).to have_content user2.name
-          click_link user2.name
-        end
-
-        find('.js-dropdown-input-clear').click
-
-        page.within '.dropdown-menu-user' do
-          expect(page).to have_content user.name
-          expect(find('.dropdown-menu-user a.is-active').first(:xpath, '..')['data-user-id']).to eq(user2.id.to_s)
-        end
-      end
-    end
-
     describe 'single assignee' do
->>>>>>> upstream/master
       before do
         # Using `allow_any_instance_of`/`and_wrap_original`, `original` would
         # somehow refer to the very block we defined to _wrap_ that method, instead of