From 0bf95be6569b35b05d4f64e5ec374356b54296cf Mon Sep 17 00:00:00 2001
From: Olivier Thereaux <olivierthereaux@users.noreply.github.com>
Date: Wed, 23 May 2018 15:31:15 +0100
Subject: [PATCH 1/2] Update Gemfile, lock pg version to 0.21

lock pg version to 0.21 as 1.0.0 is reported to not work with Rails (https://github.com/rails/rails/issues/31673) and we seem to be hitting this issue on deploy.
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 0a80e40..a7c205b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -70,7 +70,7 @@ end
 
 group :production do
   # Postgres on Heroku in production
-  gem 'pg'
+  gem 'pg', '0.21.0'
   gem 'rails_12factor' # For heroku
 end
 

From e6bf33a1bd2edd021939c9aaf7c0587c624baba7 Mon Sep 17 00:00:00 2001
From: Olivier Thereaux <olivier.thereaux@bbc.co.uk>
Date: Wed, 23 May 2018 15:45:07 +0100
Subject: [PATCH 2/2] generating Gemfile lock with pg gem locked at 0.21

---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 79f5ae1..ad73363 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -274,7 +274,7 @@ DEPENDENCIES
   jbuilder (~> 2.7)
   jquery-form-validator-rails
   jquery-rails
-  pg
+  pg (= 0.21.0)
   poltergeist
   rack-google-analytics
   rails (~> 4.2)
@@ -295,4 +295,4 @@ RUBY VERSION
    ruby 2.4.1p111
 
 BUNDLED WITH
-   1.14.6
+   1.16.2