Merge 940f8dd into 905bb63

Gemfile.lock

@@ -30,17 +30,17 @@ GEM
       activesupport (= 3.2.22.5)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activerecord-jdbc-adapter (1.3.23)
-      activerecord (>= 2.2, < 5.0)
-    activerecord-jdbcmysql-adapter (1.3.23)
-      activerecord-jdbc-adapter (~> 1.3.23)
-      jdbc-mysql (>= 5.1.22)
-    activerecord-jdbcpostgresql-adapter (1.3.23)
-      activerecord-jdbc-adapter (~> 1.3.23)
-      jdbc-postgres (>= 9.1)
-    activerecord-jdbcsqlite3-adapter (1.3.23)
-      activerecord-jdbc-adapter (~> 1.3.23)
-      jdbc-sqlite3 (>= 3.7.2, < 3.9)
+    activerecord-jdbc-adapter (50.0)
+      activerecord (>= 2.2)
+    activerecord-jdbcmysql-adapter (50.0)
+      activerecord-jdbc-adapter (~> 50.0)
+      jdbc-mysql (~> 5.1.36)
+    activerecord-jdbcpostgresql-adapter (50.0)
+      activerecord-jdbc-adapter (~> 50.0)
+      jdbc-postgres (>= 9.4, < 43)
+    activerecord-jdbcsqlite3-adapter (50.0)
+      activerecord-jdbc-adapter (~> 50.0)
+      jdbc-sqlite3 (~> 3.8, < 3.30)
     activeresource (3.2.22.5)
       activemodel (= 3.2.22.5)
       activesupport (= 3.2.22.5)
@@ -174,9 +174,9 @@ GEM
     inherited_resources (1.4.1)
       has_scope (~> 0.6.0.rc)
       responders (~> 1.0.0.rc)
-    jdbc-mysql (5.1.42)
-    jdbc-postgres (9.4.1206)
-    jdbc-sqlite3 (3.8.11.2)
+    jdbc-mysql (5.1.44)
+    jdbc-postgres (42.1.4)
+    jdbc-sqlite3 (3.20.1)
     journey (1.0.4)
     jquery-rails (3.1.4)
       railties (>= 3.0, < 5.0)