From 94b733b6a45e6456435f9b8427c72dc6017a9ab6 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Thu, 9 Feb 2012 19:03:19 +0100 Subject: [PATCH] unicorn --- Gemfile | 4 +- Gemfile.lock | 181 +++++++++++++++++++++++++++------------------------ 2 files changed, 99 insertions(+), 86 deletions(-) diff --git a/Gemfile b/Gemfile index 3165e6c..3ee63b4 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'http://rubygems.org' -gem 'rails', '3.1.0.rc4' -gem "rake", "0.8.7" +gem 'rails', '3.1.0' + # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' diff --git a/Gemfile.lock b/Gemfile.lock index a6a049a..eef186d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,69 +1,71 @@ GEM remote: http://rubygems.org/ specs: - actionmailer (3.1.0.rc4) - actionpack (= 3.1.0.rc4) + actionmailer (3.1.0) + actionpack (= 3.1.0) mail (~> 2.3.0) - actionpack (3.1.0.rc4) - activemodel (= 3.1.0.rc4) - activesupport (= 3.1.0.rc4) + actionpack (3.1.0) + activemodel (= 3.1.0) + activesupport (= 3.1.0) builder (~> 3.0.0) erubis (~> 2.7.0) i18n (~> 0.6) - rack (~> 1.3.0) - rack-cache (~> 1.0.1) - rack-mount (~> 0.8.1) - rack-test (~> 0.6.0) - sprockets (~> 2.0.0.beta.10) - tzinfo (~> 0.3.27) - activemodel (3.1.0.rc4) - activesupport (= 3.1.0.rc4) - bcrypt-ruby (~> 2.1.4) + rack (~> 1.3.2) + rack-cache (~> 1.0.3) + rack-mount (~> 0.8.2) + rack-test (~> 0.6.1) + sprockets (~> 2.0.0) + activemodel (3.1.0) + activesupport (= 3.1.0) + bcrypt-ruby (~> 3.0.0) builder (~> 3.0.0) i18n (~> 0.6) - activerecord (3.1.0.rc4) - activemodel (= 3.1.0.rc4) - activesupport (= 3.1.0.rc4) - arel (~> 2.1.1) - tzinfo (~> 0.3.27) - activeresource (3.1.0.rc4) - activemodel (= 3.1.0.rc4) - activesupport (= 3.1.0.rc4) - activesupport (3.1.0.rc4) + activerecord (3.1.0) + activemodel (= 3.1.0) + activesupport (= 3.1.0) + arel (~> 2.2.1) + tzinfo (~> 0.3.29) + activeresource (3.1.0) + activemodel (= 3.1.0) + activesupport (= 3.1.0) + activesupport (3.1.0) multi_json (~> 1.0) - acts_as_list (0.1.3) + acts_as_list (0.1.4) acts_as_tree (0.1.1) - ansi (1.3.0) - arel (2.1.3) - bcrypt-ruby (2.1.4) + ansi (1.4.2) + arel (2.2.1) + bcrypt-ruby (3.0.1) builder (3.0.0) - cancan (1.6.5) - carrierwave (0.5.5) + cancan (1.6.7) + carrierwave (0.5.8) activesupport (~> 3.0) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.1.1) - devise (1.4.2) - bcrypt-ruby (~> 2.1.2) + coffee-script-source (1.2.0) + devise (2.0.1) + bcrypt-ruby (~> 3.0) orm_adapter (~> 0.0.3) - warden (~> 1.0.3) + railties (~> 3.1) + warden (~> 1.1) erubis (2.7.0) - execjs (1.2.0) + execjs (1.3.0) multi_json (~> 1.0) - formtastic (1.2.4) - actionpack (>= 2.3.7) - activesupport (>= 2.3.7) - i18n (~> 0.4) - haml (3.1.2) - hike (1.1.0) + formtastic (2.0.2) + rails (~> 3.0) + haml (3.1.4) + hike (1.2.1) i18n (0.6.0) - jquery-rails (1.0.12) + jquery-rails (1.0.19) railties (~> 3.0) thor (~> 0.14) - kaminari (0.12.4) - rails (>= 3.0.0) - libv8 (3.3.10.2) + json (1.6.5) + kaminari (0.13.0) + actionpack (>= 3.0.0) + activesupport (>= 3.0.0) + railties (>= 3.0.0) + kgio (2.7.2) + libv8 (3.3.10.4) mail (2.3.0) i18n (>= 0.4.0) mime-types (~> 1.16) @@ -72,65 +74,74 @@ GEM actionpack (~> 3.1.0.alpha) activerecord (~> 3.1.0.alpha) activesupport (~> 3.1.0.alpha) - mime-types (1.16) + mime-types (1.17.2) mimetype-fu (0.1.2) - multi_json (1.0.3) - orm_adapter (0.0.5) - polyglot (0.3.1) - rack (1.3.0) - rack-cache (1.0.2) + multi_json (1.0.4) + mysql2 (0.3.11) + orm_adapter (0.0.6) + polyglot (0.3.3) + rack (1.3.6) + rack-cache (1.0.3) rack (>= 0.4) - rack-mount (0.8.1) + rack-mount (0.8.3) rack (>= 1.0.0) rack-ssl (1.3.2) rack - rack-test (0.6.0) + rack-test (0.6.1) rack (>= 1.0) - rails (3.1.0.rc4) - actionmailer (= 3.1.0.rc4) - actionpack (= 3.1.0.rc4) - activerecord (= 3.1.0.rc4) - activeresource (= 3.1.0.rc4) - activesupport (= 3.1.0.rc4) + rails (3.1.0) + actionmailer (= 3.1.0) + actionpack (= 3.1.0) + activerecord (= 3.1.0) + activeresource (= 3.1.0) + activesupport (= 3.1.0) bundler (~> 1.0) - railties (= 3.1.0.rc4) - railties (3.1.0.rc4) - actionpack (= 3.1.0.rc4) - activesupport (= 3.1.0.rc4) + railties (= 3.1.0) + railties (3.1.0) + actionpack (= 3.1.0) + activesupport (= 3.1.0) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.6) - rake (0.8.7) - rdoc (3.8) + raindrops (0.8.0) + rake (0.9.2.2) + rdoc (3.12) + json (~> 1.4) rmagick (2.13.1) - sass (3.1.4) - sass-rails (3.1.0.rc.4) - actionpack (~> 3.1.0.rc1) - railties (~> 3.1.0.rc1) - sass (>= 3.1.4) - sprockets (>= 2.0.0.beta.9) - simple-navigation (3.3.3) + sass (3.1.14) + sass-rails (3.1.5) + actionpack (~> 3.1.0) + railties (~> 3.1.0) + sass (~> 3.1.10) + tilt (~> 1.3.2) + simple-navigation (3.6.0) activesupport (>= 2.3.2) - sprockets (2.0.0.beta.10) - hike (~> 1.0) + sprockets (2.0.3) + hike (~> 1.2) rack (~> 1.0) tilt (!= 1.3.0, ~> 1.1) - sqlite3 (1.3.3) - therubyracer (0.9.2) + sqlite3 (1.3.5) + therubyracer (0.9.9) libv8 (~> 3.3.10) thor (0.14.6) - tilt (1.3.2) - treetop (1.4.9) + tilt (1.3.3) + treetop (1.4.10) + polyglot polyglot (>= 0.3.1) - turn (0.8.2) - ansi (>= 1.2.2) - tzinfo (0.3.29) - uglifier (1.0.0) + turn (0.9.2) + ansi + tzinfo (0.3.31) + uglifier (1.2.3) execjs (>= 0.3.0) multi_json (>= 1.0.2) - warden (1.0.4) + unicorn (4.2.0) + kgio (~> 2.6) + rack + raindrops (~> 0.7) + warden (1.1.0) rack (>= 1.0) + yaml_db (0.2.2) PLATFORMS ruby @@ -148,8 +159,8 @@ DEPENDENCIES kaminari meta_search (= 1.1.0.pre2) mimetype-fu - rails (= 3.1.0.rc4) - rake (= 0.8.7) + mysql2 + rails (= 3.1.0) rmagick sass-rails (~> 3.1.0.rc) simple-navigation @@ -157,3 +168,5 @@ DEPENDENCIES therubyracer turn uglifier + unicorn + yaml_db