Merge branch 'master' into upgrade_rails_6

Author: jessevanherk

Gemfile.lock

@@ -44,20 +44,22 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
+    concurrent-ruby (1.1.7)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     execjs (2.7.0)
     hike (1.2.3)
-    i18n (0.7.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     ice_cube (0.16.3)
-    jquery-rails (3.1.2)
+    jquery-rails (3.1.5)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     mime-types (2.6.2)
     minitest (4.7.5)
-    multi_json (1.11.2)
+    multi_json (1.15.0)
     rack (1.5.5)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -101,7 +103,7 @@ GEM
       sass (~> 3.2.2)
       sprockets (~> 2.8, < 3.0)
       sprockets-rails (~> 2.0)
-    sprockets (2.12.4)
+    sprockets (2.12.5)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -110,10 +112,10 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
+    thor (1.0.1)
+    thread_safe (0.3.6)
     tilt (1.4.1)
-    tzinfo (0.3.44)
+    tzinfo (0.3.57)
 
 PLATFORMS
   ruby