From aed43faf8f2e789f6b36c4df1b961096558add6d Mon Sep 17 00:00:00 2001
From: Brett Walker <bwalker@gitlab.com>
Date: Fri, 6 Jul 2018 14:02:51 -0500
Subject: [PATCH] Resolve CE->EE merge conflict
---
spec/lib/gitlab/database_spec.rb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/spec/lib/gitlab/database_spec.rb b/spec/lib/gitlab/database_spec.rb
index 22bb9b5c72e00..81a2a08b17b31 100644
--- a/spec/lib/gitlab/database_spec.rb
+++ b/spec/lib/gitlab/database_spec.rb
@@ -443,7 +443,6 @@
end
end
-<<<<<<< HEAD
describe '#disable_prepared_statements' do
it 'disables prepared statements' do
config = {}
@@ -489,7 +488,9 @@
it 'returns false' do
expect(described_class.read_only?).to be_falsey
end
-=======
+ end
+ end
+
describe '.db_read_only?' do
context 'when using PostgreSQL' do
before do
@@ -516,7 +517,6 @@
end
it { expect(described_class.db_read_only?).to be_falsey }
->>>>>>> upstream/master
end
end
--
GitLab