diff Gemfile.lock @ 361:9d36e15cd5eb

Update gems.
author edogawaconan <me@myconan.net>
date Mon, 24 Nov 2014 17:14:24 +0900
parents 36ad4d9590e3
children cbf116933259
line wrap: on
line diff
--- a/Gemfile.lock	Mon Nov 17 13:01:30 2014 +0900
+++ b/Gemfile.lock	Mon Nov 24 17:14:24 2014 +0900
@@ -21,10 +21,10 @@
       activemodel (= 4.1.8)
       activesupport (= 4.1.8)
       arel (~> 5.0.0)
-    activerecord-jdbc-adapter (1.3.12)
+    activerecord-jdbc-adapter (1.3.13)
       activerecord (>= 2.2)
-    activerecord-jdbcpostgresql-adapter (1.3.12)
-      activerecord-jdbc-adapter (~> 1.3.12)
+    activerecord-jdbcpostgresql-adapter (1.3.13)
+      activerecord-jdbc-adapter (~> 1.3.13)
       jdbc-postgres (>= 9.1)
     activesupport (4.1.8)
       i18n (~> 0.6, >= 0.6.9)
@@ -65,9 +65,9 @@
     multi_json (1.10.1)
     newrelic_rpm (3.9.7.266)
     pg (0.17.1)
-    puma (2.9.2)
+    puma (2.10.0)
       rack (>= 1.1, < 2.0)
-    puma (2.9.2-java)
+    puma (2.10.0-java)
       rack (>= 1.1, < 2.0)
     quiet_assets (1.0.3)
       railties (>= 3.1, < 5.0)
@@ -102,7 +102,7 @@
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.0)
+    sprockets-rails (2.2.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)