diff Gemfile.lock @ 343:c914299c5459

Update rails and gems.
author edogawaconan <me@myconan.net>
date Thu, 03 Jul 2014 11:32:54 +0900
parents 4048614cb4cf
children 49ae9d1f4f2c
line wrap: on
line diff
--- a/Gemfile.lock	Tue Jul 01 00:36:08 2014 +0900
+++ b/Gemfile.lock	Thu Jul 03 11:32:54 2014 +0900
@@ -1,32 +1,32 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.2)
-      actionpack (= 4.1.2)
-      actionview (= 4.1.2)
+    actionmailer (4.1.4)
+      actionpack (= 4.1.4)
+      actionview (= 4.1.4)
       mail (~> 2.5.4)
-    actionpack (4.1.2)
-      actionview (= 4.1.2)
-      activesupport (= 4.1.2)
+    actionpack (4.1.4)
+      actionview (= 4.1.4)
+      activesupport (= 4.1.4)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.2)
-      activesupport (= 4.1.2)
+    actionview (4.1.4)
+      activesupport (= 4.1.4)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.2)
-      activesupport (= 4.1.2)
+    activemodel (4.1.4)
+      activesupport (= 4.1.4)
       builder (~> 3.1)
-    activerecord (4.1.2)
-      activemodel (= 4.1.2)
-      activesupport (= 4.1.2)
+    activerecord (4.1.4)
+      activemodel (= 4.1.4)
+      activesupport (= 4.1.4)
       arel (~> 5.0.0)
     activerecord-jdbc-adapter (1.3.8)
       activerecord (>= 2.2)
     activerecord-jdbcpostgresql-adapter (1.3.8)
       activerecord-jdbc-adapter (~> 1.3.8)
       jdbc-postgres (>= 9.1)
-    activesupport (4.1.2)
+    activesupport (4.1.4)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -69,19 +69,19 @@
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.1.2)
-      actionmailer (= 4.1.2)
-      actionpack (= 4.1.2)
-      actionview (= 4.1.2)
-      activemodel (= 4.1.2)
-      activerecord (= 4.1.2)
-      activesupport (= 4.1.2)
+    rails (4.1.4)
+      actionmailer (= 4.1.4)
+      actionpack (= 4.1.4)
+      actionview (= 4.1.4)
+      activemodel (= 4.1.4)
+      activerecord (= 4.1.4)
+      activesupport (= 4.1.4)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.2)
+      railties (= 4.1.4)
       sprockets-rails (~> 2.0)
-    railties (4.1.2)
-      actionpack (= 4.1.2)
-      activesupport (= 4.1.2)
+    railties (4.1.4)
+      actionpack (= 4.1.4)
+      activesupport (= 4.1.4)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)