Merge branch 'master' into update-toby-pub-key

ministryofjustice · Jan 11, 2019 · 4ca2595 · 4ca2595
2 parents 80c054d + 5e149f3
commit 4ca2595
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/.git-crypt/keys/default/0/666E15DD22AD19E4F53AE0F96910A6E4832A5C3C.gpg b/.git-crypt/keys/default/0/666E15DD22AD19E4F53AE0F96910A6E4832A5C3C.gpg
diff --git a/.git-crypt/keys/default/0/EC0D2E07D6C816DCF0F423FA02A3B16708CB3017.gpg b/.git-crypt/keys/default/0/EC0D2E07D6C816DCF0F423FA02A3B16708CB3017.gpg
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -56,7 +56,7 @@ GEM
     diff-lcs (1.3)
     docile (1.3.0)
     erubi (1.7.1)
-    faraday (0.15.3)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.25)
     globalid (0.4.1)
@@ -96,7 +96,7 @@ GEM
     parallel (1.12.1)
     parser (2.5.3.0)
       ast (~> 2.4.0)
-    pg (1.1.3)
+    pg (1.1.4)
     powerpack (0.1.2)
     puma (3.12.0)
     rack (2.0.6)
@@ -162,7 +162,7 @@ GEM
       rubocop (>= 0.60.0)
     ruby-progressbar (1.10.0)
     ruby_dep (1.5.0)
-    sentry-raven (2.7.4)
+    sentry-raven (2.8.0)
       faraday (>= 0.7.6, < 1.0)
     simplecov (0.16.1)
       docile (~> 1.1)