CE->EE: Fix merge conflicts

app/models/merge_request.rb

@@ -961,13 +961,12 @@ class MergeRequest < ActiveRecord::Base
     true
   end
 
-<<<<<<< HEAD
   def base_pipeline
     @base_pipeline ||= project.pipelines.find_by(sha: merge_request_diff&.base_commit_sha)
-=======
+  end
+
   def update_project_counter_caches
     Projects::OpenMergeRequestsCountService.new(target_project).refresh_cache
->>>>>>> ce/master
   end
 
   private

spec/lib/gitlab/ldap/adapter_spec.rb

@@ -16,11 +16,7 @@ describe Gitlab::LDAP::Adapter do
       expect(adapter).to receive(:ldap_search) do |arg|
         expect(arg[:filter].to_s).to eq('(uid=johndoe)')
         expect(arg[:base]).to eq('dc=example,dc=com')
-<<<<<<< HEAD
         expect(arg[:attributes]).to match(%w{dn uid cn mail email userPrincipalName memberof})
-=======
-        expect(arg[:attributes]).to match(%w{dn uid cn mail email userPrincipalName})
->>>>>>> ce/master
       end.and_return({})
 
       adapter.users('uid', 'johndoe')
@@ -30,11 +26,7 @@ describe Gitlab::LDAP::Adapter do
       expect(adapter).to receive(:ldap_search).with(
         base: 'uid=johndoe,ou=users,dc=example,dc=com',
         scope: Net::LDAP::SearchScope_BaseObject,
-<<<<<<< HEAD
         attributes: %w{dn uid cn mail email userPrincipalName memberof},
-=======
-        attributes: %w{dn uid cn mail email userPrincipalName},
->>>>>>> ce/master
         filter: nil
       ).and_return({})
 
@@ -71,11 +63,7 @@ describe Gitlab::LDAP::Adapter do
     it 'uses the right uid attribute when non-default' do
       stub_ldap_config(uid: 'sAMAccountName')
       expect(adapter).to receive(:ldap_search).with(
-<<<<<<< HEAD
         hash_including(attributes: %w{dn sAMAccountName cn mail email userPrincipalName memberof})
-=======
-        hash_including(attributes: %w{dn sAMAccountName cn mail email userPrincipalName})
->>>>>>> ce/master
       ).and_return({})
 
       adapter.users('sAMAccountName', 'johndoe')

spec/support/db_cleaner.rb

@@ -13,21 +13,12 @@ RSpec.configure do |config|
     DatabaseCleaner.strategy = :transaction
   end
 
-<<<<<<< HEAD
-  config.before(:each, js: true) do
-    DatabaseCleaner.strategy = :truncation, { except: ['licenses'] }
-  end
-
-  config.before(:each, truncate: true) do
-    DatabaseCleaner.strategy = :truncation, { except: ['licenses'] }
-=======
   config.before(:each, :js) do
-    DatabaseCleaner.strategy = :truncation
+    DatabaseCleaner.strategy = :truncation, { except: ['licenses'] }
   end
 
   config.before(:each, :truncate) do
-    DatabaseCleaner.strategy = :truncation
->>>>>>> ce/master
+    DatabaseCleaner.strategy = :truncation, { except: ['licenses'] }
   end
 
   config.before(:each, :migration) do