From 031cb31839b66f89387f54fa578dd9b1fc8a026e Mon Sep 17 00:00:00 2001
From: Curtis Ekstrom <code@fauxton.io>
Date: Thu, 1 Feb 2018 15:38:04 +0100
Subject: [PATCH 1/2] Update ActiveRecord and friends

* Also updated:
- minitest
- database_cleaner (handles deprecation warnings)
---
 Gemfile.lock | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a9cb7855c..42f93c06c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -72,28 +72,26 @@ GEM
   remote: https://gems.contribsys.com/
   specs:
     HDRHistogram (0.1.3)
-    activemodel (4.2.8)
-      activesupport (= 4.2.8)
-      builder (~> 3.1)
-    activerecord (4.2.8)
-      activemodel (= 4.2.8)
-      activesupport (= 4.2.8)
-      arel (~> 6.0)
-    activesupport (4.2.8)
+    activemodel (5.1.4)
+      activesupport (= 5.1.4)
+    activerecord (5.1.4)
+      activemodel (= 5.1.4)
+      activesupport (= 5.1.4)
+      arel (~> 8.0)
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.4.0)
     amq-protocol (2.0.1)
-    arel (6.0.4)
+    arel (8.0.0)
     atomic (1.1.99)
     avl_tree (1.2.1)
       atomic (~> 1.1)
     backports (3.8.0)
     bourne (1.6.0)
       mocha (~> 1.1)
-    builder (3.2.3)
     bunny (2.5.1)
       amq-protocol (>= 2.0.1)
     coder (0.4.0)
@@ -102,7 +100,7 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     dalli (2.7.6)
-    database_cleaner (1.5.3)
+    database_cleaner (1.6.2)
     diff-lcs (1.2.5)
     factory_girl (4.7.0)
       activesupport (>= 3.0.0)
@@ -118,13 +116,14 @@ GEM
     hashdiff (0.3.0)
     hashr (2.0.0)
     hitimes (1.2.6)
-    i18n (0.8.1)
+    i18n (0.9.3)
+      concurrent-ruby (~> 1.0)
     jemalloc (1.0.1)
     jwt (1.5.4)
     keen (0.7.8)
       multi_json (~> 1.0)
     metaclass (0.0.4)
-    minitest (5.10.2)
+    minitest (5.11.3)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.12.1)
@@ -183,7 +182,7 @@ GEM
     thread_safe (0.3.6)
     tilt (2.0.8)
     travis-encrypt (0.0.5)
-    tzinfo (1.2.3)
+    tzinfo (1.2.4)
       thread_safe (~> 0.1)
     webmock (2.1.0)
       addressable (>= 2.3.6)
@@ -237,4 +236,4 @@ RUBY VERSION
    ruby 2.4.2p198
 
 BUNDLED WITH
-   1.16.0
+   1.16.1

From 7d48a567e27e946ee6a9dc7248d791dcb526260d Mon Sep 17 00:00:00 2001
From: Curtis Ekstrom <code@fauxton.io>
Date: Thu, 1 Feb 2018 15:40:44 +0100
Subject: [PATCH 2/2] Bump marginalia and pg

---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 42f93c06c..c2ee419bb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,10 +6,10 @@ GIT
 
 GIT
   remote: https://github.com/travis-ci/marginalia
-  revision: 1733a09de1dd8a4e9b6d92cee7413eacb38f0db1
+  revision: 7cda719e36c38610b0a4e3c5428e5f23844db0ae
   specs:
     marginalia (1.5.0)
-      activerecord (>= 2.3)
+      pg (~> 0.21)
 
 GIT
   remote: https://github.com/travis-ci/metriks
@@ -130,7 +130,7 @@ GEM
     multipart-post (2.0.0)
     net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
-    pg (0.19.0)
+    pg (0.21.0)
     puma (3.6.0)
     rack (1.6.8)
     rack-protection (1.5.3)