null+****@clear*****
null+****@clear*****
Tue Jul 3 10:51:18 JST 2012
SHIMADA Koji 2012-07-03 10:51:18 +0900 (Tue, 03 Jul 2012) New Revision: 1fba25224b1ba37822f07740336fc71e49632833 https://github.com/logaling/logaling-server/commit/1fba25224b1ba37822f07740336fc71e49632833 Log: Update Gemfile.lock Exec `bundle update`. Modified files: Gemfile.lock Modified: Gemfile.lock (+13 -14) =================================================================== --- Gemfile.lock 2012-07-02 12:28:15 +0900 (a138572) +++ Gemfile.lock 2012-07-03 10:51:18 +0900 (ca5004f) @@ -52,7 +52,7 @@ GEM rack-test (>= 0.5.4) selenium-webdriver (~> 2.0) xpath (~> 0.1.4) - childprocess (0.3.2) + childprocess (0.3.3) ffi (~> 1.0.6) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -64,7 +64,7 @@ GEM commonjs (0.2.6) diff-lcs (1.1.3) erubis (2.7.0) - execjs (1.3.2) + execjs (1.4.0) multi_json (~> 1.0) ffi (1.0.11) haml (3.1.6) @@ -78,12 +78,12 @@ GEM io-like (0.3.0) journey (1.0.4) jquery-rails (2.0.2) - railties (>= 3.2.0, < 5.0) + railties (< 5.0, >= 3.2.0) thor (~> 0.14) json (1.7.3) less (2.2.1) commonjs (~> 0.2.6) - less-rails (2.2.2) + less-rails (2.2.3) actionpack (>= 3.1) less (~> 2.2.0) libv8 (3.3.10.4) @@ -119,7 +119,7 @@ GEM rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) - thor (>= 0.14.6, < 2.0) + thor (< 2.0, >= 0.14.6) rainbow (1.1.4) rake (0.9.2.2) rdoc (3.12) @@ -132,7 +132,7 @@ GEM rspec-core (~> 2.10.0) rspec-expectations (~> 2.10.0) rspec-mocks (~> 2.10.0) - rspec-core (2.10.0) + rspec-core (2.10.1) rspec-expectations (2.10.0) diff-lcs (~> 1.1.3) rspec-mocks (2.10.1) @@ -141,22 +141,21 @@ GEM activesupport (>= 3.0) railties (>= 3.0) rspec (~> 2.10.0) - rubyzip (0.9.8) - sass (3.1.18) + rubyzip (0.9.9) + sass (3.1.20) sass-rails (3.2.5) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - selenium-webdriver (2.21.2) + selenium-webdriver (2.24.0) childprocess (>= 0.2.5) - ffi (~> 1.0) libwebsocket (~> 0.1.3) multi_json (~> 1.0) rubyzip sprockets (2.1.3) hike (~> 1.2) rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) + tilt (!= 1.3.0, ~> 1.1) sqlite3 (1.3.6) therubyracer (0.10.1) libv8 (~> 3.3.10) @@ -165,15 +164,15 @@ GEM treetop (1.4.10) polyglot polyglot (>= 0.3.1) - twitter-bootstrap-rails (2.0.7) + twitter-bootstrap-rails (2.1.0) actionpack (>= 3.1) less-rails (~> 2.2.2) railties (>= 3.1) therubyracer (~> 0.10.1) tzinfo (0.3.33) - uglifier (1.2.4) + uglifier (1.2.6) execjs (>= 0.3.0) - multi_json (>= 1.0.2) + multi_json (~> 1.3) xpath (0.1.4) nokogiri (~> 1.3) -------------- next part -------------- An HTML attachment was scrubbed...下載
