[CE->EE] Resove non-JS related conflicts

.gitlab-ci.yml

@@ -480,11 +480,7 @@ db:migrate:reset-mysql:
   variables:
     SETUP_DB: "false"
   script:
-<<<<<<< HEAD
-    - git fetch origin v8.14.10-ee
-=======
-    - git fetch origin v9.3.0
->>>>>>> 6306e797acca358c79c120e5b12c29a5ec604571
+    - git fetch origin v9.3.0-ee
     - git checkout -f FETCH_HEAD
     - bundle install $BUNDLE_INSTALL_FLAGS
     - cp config/gitlab.yml.example config/gitlab.yml

app/models/identity.rb

@@ -7,15 +7,11 @@ class Identity < ActiveRecord::Base
   validates :extern_uid, allow_blank: true, uniqueness: { scope: :provider }
   validates :user_id, uniqueness: { scope: :provider }
 
-<<<<<<< HEAD
   scope :with_provider, ->(provider) { where(provider: provider) }
-  scope :with_extern_uid, ->(provider, extern_uid) { where(extern_uid: extern_uid, provider: provider) }
-=======
   scope :with_extern_uid, ->(provider, extern_uid) do
     extern_uid = Gitlab::LDAP::Person.normalize_dn(extern_uid) if provider.starts_with?('ldap')
     where(extern_uid: extern_uid, provider: provider)
   end
->>>>>>> 6306e797acca358c79c120e5b12c29a5ec604571
 
   def ldap?
     provider.starts_with?('ldap')

app/serializers/merge_request_basic_entity.rb

@@ -4,8 +4,5 @@ class MergeRequestBasicEntity < IssuableSidebarEntity
   expose :merge_error
   expose :state
   expose :source_branch_exists?, as: :source_branch_exists
-<<<<<<< HEAD
   expose :rebase_in_progress?, as: :rebase_in_progress
-=======
->>>>>>> 6306e797acca358c79c120e5b12c29a5ec604571
 end

app/services/milestones/promote_service.rb

 module Milestones
   class PromoteService < Milestones::BaseService
-<<<<<<< HEAD
     prepend EE::Milestones::PromoteService
 
-=======
->>>>>>> 6306e797acca358c79c120e5b12c29a5ec604571
     PromoteMilestoneError = Class.new(StandardError)
 
     def execute(milestone)

spec/fixtures/api/schemas/entities/issue.json

@@ -10,10 +10,7 @@
     "title": { "type": "string" },
     "moved_to_id": { "type": ["integer", "null"] },
     "project_id": { "type": "integer" },
-<<<<<<< HEAD
     "weight": { "type": ["integer", "null"] },
-=======
->>>>>>> 6306e797acca358c79c120e5b12c29a5ec604571
     "web_url": { "type": "string" },
     "state": { "type": "string" },
     "create_note_path": { "type": "string" },

spec/fixtures/api/schemas/entities/merge_request_basic.json

@@ -9,10 +9,7 @@
     "human_time_estimate": { "type": ["string", "null"] },
     "human_total_time_spent": { "type": ["string", "null"] },
     "merge_error": { "type": ["string", "null"] },
-<<<<<<< HEAD
     "rebase_in_progress": { "type": "boolean" },
-=======
->>>>>>> 6306e797acca358c79c120e5b12c29a5ec604571
     "assignee_id": { "type": ["integer", "null"] },
     "subscribed": { "type": ["boolean", "null"] },
     "participants": { "type": "array" }

spec/lib/gitlab/database_spec.rb

@@ -257,7 +257,6 @@ describe Gitlab::Database do
     end
   end
 
-<<<<<<< HEAD
   describe '#disable_prepared_statements' do
     it 'disables prepared statements' do
       config = {}
@@ -306,8 +305,6 @@ describe Gitlab::Database do
     end
   end
 
-=======
->>>>>>> 6306e797acca358c79c120e5b12c29a5ec604571
   describe '#sanitize_timestamp' do
     let(:max_timestamp) { Time.at((1 << 31) - 1) }