diff Gemfile.lock @ 169:b8116b5d263e

Gem updates.
author Edho Arief <edho@myconan.net>
date Thu, 03 Jan 2013 18:42:16 +0400
parents 8dd89c0e545d
children da48ac3ef99d
line wrap: on
line diff
--- a/Gemfile.lock	Fri Jan 04 22:44:21 2013 +0000
+++ b/Gemfile.lock	Thu Jan 03 18:42:16 2013 +0400
@@ -22,9 +22,9 @@
       activesupport (= 3.2.9)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activerecord-jdbc-adapter (1.2.2.1)
-    activerecord-jdbcmysql-adapter (1.2.2.1)
-      activerecord-jdbc-adapter (~> 1.2.2.1)
+    activerecord-jdbc-adapter (1.2.5)
+    activerecord-jdbcmysql-adapter (1.2.5)
+      activerecord-jdbc-adapter (~> 1.2.5)
       jdbc-mysql (~> 5.1.0)
     activeresource (3.2.9)
       activemodel (= 3.2.9)
@@ -46,12 +46,12 @@
     jdbc-mysql (5.1.22)
     journey (1.0.4)
     jquery-rails (2.1.4)
-      railties (< 5.0, >= 3.0)
-      thor (< 2.0, >= 0.14)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
     jruby-openssl (0.8.2)
       bouncy-castle-java (>= 1.5.0146.1)
-    json (1.7.5)
-    json (1.7.5-java)
+    json (1.7.6)
+    json (1.7.6-java)
     kgio (2.7.4)
     mail (2.4.4)
       i18n (>= 0.4.0)
@@ -87,7 +87,7 @@
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (< 2.0, >= 0.14.6)
+      thor (>= 0.14.6, < 2.0)
     raindrops (0.10.0)
     rake (10.0.3)
     rdoc (3.12)
@@ -101,7 +101,7 @@
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
-      tilt (!= 1.3.0, ~> 1.1)
+      tilt (~> 1.1, != 1.3.0)
     therubyrhino (2.0.2)
       therubyrhino_jar (>= 1.7.3)
     therubyrhino_jar (1.7.4)
@@ -113,7 +113,7 @@
     tzinfo (0.3.35)
     uglifier (1.3.0)
       execjs (>= 0.3.0)
-      multi_json (>= 1.0.2, ~> 1.0)
+      multi_json (~> 1.0, >= 1.0.2)
     unicorn (4.5.0)
       kgio (~> 2.6)
       rack