Resolve conflicts

doc/ci/examples/code_climate.md

@@ -35,11 +35,7 @@ Starting with [GitLab Starter][ee] 9.3, this information will
 be automatically extracted and shown right in the merge request widget. To do
 so, the CI/CD job must be named `codequality` and the artifact path must be
 `codeclimate.json`.
-<<<<<<< HEAD
-[Learn more on code quality diffs in merge requests](../../user/project/merge_requests/code_quality_diff.md).
-=======
 [Learn more on code quality diffs in merge requests](https://docs.gitlab.com/ee/user/project/merge_requests/code_quality_diff.html).
->>>>>>> upstream/master
 
 [cli]: https://github.com/codeclimate/codeclimate
 [dind]: ../docker/using_docker_build.md#use-docker-in-docker-executor

lib/gitlab/database.rb

@@ -203,14 +203,11 @@ module Gitlab
       connection.schema_cache.columns_hash(table_name).has_key?(column_name.to_s)
     end
 
-<<<<<<< HEAD
-=======
     def self.cached_table_exists?(table_name)
       # Rails 5 uses data_source_exists? instead of table_exists?
       connection.schema_cache.table_exists?(table_name)
     end
 
->>>>>>> upstream/master
     private_class_method :connection
 
     def self.database_version

spec/lib/gitlab/database_spec.rb

@@ -298,8 +298,6 @@ describe Gitlab::Database do
     end
   end
 
-<<<<<<< HEAD
-=======
   describe '.cached_table_exists?' do
     it 'only retrieves data once per table' do
       expect(ActiveRecord::Base.connection).to receive(:table_exists?).with(:projects).once.and_call_original
@@ -312,7 +310,6 @@ describe Gitlab::Database do
     end
   end
 
->>>>>>> upstream/master
   describe '#true_value' do
     it 'returns correct value for PostgreSQL' do
       expect(described_class).to receive(:postgresql?).and_return(true)