# HG changeset patch # User Edho Arief # Date 1356681116 -14400 # Node ID 8dd89c0e545d32ac79f3d90beb181254567c657b # Parent 4b0894e3eb1cf688262ca3b991acffe6fde93550 Gem updates. diff -r 4b0894e3eb1c -r 8dd89c0e545d Gemfile.lock --- a/Gemfile.lock Tue Dec 18 07:51:35 2012 +0300 +++ b/Gemfile.lock Fri Dec 28 11:51:56 2012 +0400 @@ -43,11 +43,11 @@ multi_json (~> 1.0) hike (1.2.1) i18n (0.6.1) - jdbc-mysql (5.1.13) + jdbc-mysql (5.1.22) journey (1.0.4) jquery-rails (2.1.4) - railties (>= 3.0, < 5.0) - thor (>= 0.14, < 2.0) + railties (< 5.0, >= 3.0) + thor (< 2.0, >= 0.14) jruby-openssl (0.8.2) bouncy-castle-java (>= 1.5.0146.1) json (1.7.5) @@ -60,7 +60,7 @@ mime-types (1.19) multi_json (1.5.0) mysql2 (0.3.11) - newrelic_rpm (3.5.3.25) + newrelic_rpm (3.5.4.34) polyglot (0.3.3) puma (1.6.3) rack (~> 1.2) @@ -87,12 +87,12 @@ rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) - thor (>= 0.14.6, < 2.0) + thor (< 2.0, >= 0.14.6) raindrops (0.10.0) rake (10.0.3) rdoc (3.12) json (~> 1.4) - sass (3.2.3) + sass (3.2.4) sass-rails (3.2.5) railties (~> 3.2.0) sass (>= 3.1.10) @@ -101,7 +101,7 @@ hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) + tilt (!= 1.3.0, ~> 1.1) 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, >= 1.0.2) + multi_json (>= 1.0.2, ~> 1.0) unicorn (4.5.0) kgio (~> 2.6) rack