From 61067dc2e6105c8d4fcb8c3e864a60490c384354 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <mjankowski@thoughtbot.com>
Date: Fri, 28 Apr 2017 09:10:58 -0400
Subject: [PATCH] Gem version updates (#2566)

* Update autoprefixer-rails to version 6.7.7.2

* Update aws-sdk to version 2.9.12

* Update http to version 2.2.2

* Update mail to version 2.6.5

* Update pghero to version 1.6.5

* Update ox to version 2.4.13

* Update json to version 2.1.0

* Update capistrano-rbenv to version 2.1.1

* Update httplog to version 0.99.3

* Update rainbow to version 2.2.2

* Update pkg-config to version 1.2.0

* Update globalid to version 0.4.0

* Update redis-rack to version 2.0.2

* Update webmock to version 3.0.1

* Update oj to version 3.0.2
---
 Gemfile.lock | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a41187a92c..b519f2d622 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -47,17 +47,17 @@ GEM
     ast (2.3.0)
     attr_encrypted (3.0.3)
       encryptor (~> 3.0.0)
-    autoprefixer-rails (6.7.7.1)
+    autoprefixer-rails (6.7.7.2)
       execjs
     av (0.9.0)
       cocaine (~> 0.5.3)
-    aws-sdk (2.9.6)
-      aws-sdk-resources (= 2.9.6)
-    aws-sdk-core (2.9.6)
+    aws-sdk (2.9.12)
+      aws-sdk-resources (= 2.9.12)
+    aws-sdk-core (2.9.12)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.9.6)
-      aws-sdk-core (= 2.9.6)
+    aws-sdk-resources (2.9.12)
+      aws-sdk-core (= 2.9.12)
     aws-sigv4 (1.0.0)
     babel-source (5.8.35)
     babel-transpiler (0.7.0)
@@ -94,7 +94,7 @@ GEM
     capistrano-rails (1.2.3)
       capistrano (~> 3.1)
       capistrano-bundler (~> 1.1)
-    capistrano-rbenv (2.1.0)
+    capistrano-rbenv (2.1.1)
       capistrano (~> 3.1)
       sshkit (~> 1.3)
     capistrano-yarn (2.0.2)
@@ -163,8 +163,8 @@ GEM
     fuubar (2.2.0)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    globalid (0.3.7)
-      activesupport (>= 4.1.0)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
     goldfinger (1.2.0)
       addressable (~> 2.4)
       http (~> 2.0)
@@ -182,7 +182,7 @@ GEM
     highline (1.7.8)
     hiredis (0.6.1)
     htmlentities (4.3.4)
-    http (2.2.1)
+    http (2.2.2)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
       http-form_data (~> 1.0.1)
@@ -192,8 +192,9 @@ GEM
     http-form_data (1.0.1)
     http_accept_language (2.1.0)
     http_parser.rb (0.6.0)
-    httplog (0.99.2)
+    httplog (0.99.3)
       colorize
+      rack
     i18n (0.8.1)
     i18n-tasks (0.9.13)
       activesupport (>= 4.0.2)
@@ -210,7 +211,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.0.3)
+    json (2.1.0)
     kaminari (1.0.1)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.0.1)
@@ -240,7 +241,7 @@ GEM
       railties (>= 4, < 5.1)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.4)
+    mail (2.6.5)
       mime-types (>= 1.16, < 4)
     method_source (0.8.2)
     microformats2 (2.1.0)
@@ -261,7 +262,7 @@ GEM
       mini_portile2 (~> 2.1.0)
     nokogumbo (1.4.10)
       nokogiri
-    oj (2.18.5)
+    oj (3.0.2)
     openssl (2.0.3)
     orm_adapter (0.5.0)
     ostatus2 (1.1.0)
@@ -269,7 +270,7 @@ GEM
       http (~> 2.0)
       nokogiri (~> 1.6)
       openssl (~> 2.0)
-    ox (2.4.11)
+    ox (2.4.13)
     paperclip (5.1.0)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
@@ -282,9 +283,9 @@ GEM
     parser (2.4.0.0)
       ast (~> 2.2)
     pg (0.20.0)
-    pghero (1.6.4)
+    pghero (1.6.5)
       activerecord
-    pkg-config (1.1.7)
+    pkg-config (1.2.0)
     powerpack (0.1.1)
     pry (0.10.4)
       coderay (~> 1.1.0)
@@ -342,7 +343,8 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.1)
+    rainbow (2.2.2)
+      rake
     rake (12.0.0)
     react-rails (1.11.0)
       babel-transpiler (>= 0.7.0)
@@ -358,8 +360,8 @@ GEM
     redis-activesupport (5.0.2)
       activesupport (>= 3, < 6)
       redis-store (~> 1.3.0)
-    redis-rack (2.0.1)
-      rack (>= 2.0, < 3)
+    redis-rack (2.0.2)
+      rack (>= 1.5, < 3)
       redis-store (>= 1.2, < 1.4)
     redis-rails (5.0.2)
       redis-actionpack (>= 5.0, < 6)
@@ -464,7 +466,7 @@ GEM
     uniform_notifier (1.10.0)
     warden (1.2.7)
       rack (>= 1.0)
-    webmock (2.3.2)
+    webmock (3.0.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff