From 7b4f7c553276ab183b96e4af4139469ef158ba32 Mon Sep 17 00:00:00 2001 From: albert Date: Fri, 11 Jan 2013 17:25:49 -0500 Subject: [PATCH] updated gemfile --- Gemfile | 2 +- Gemfile.lock | 154 ++++++++++++++++++++++++++------------------------- 2 files changed, 81 insertions(+), 75 deletions(-) diff --git a/Gemfile b/Gemfile index 5e4f18633..90767f73c 100644 --- a/Gemfile +++ b/Gemfile @@ -14,7 +14,7 @@ group :assets do gem "therubyracer" end -gem "rails", "3.2.3" +gem "rails", "3.2.11" gem "pg", "0.12.2" gem "memcache-client", :require => "memcache" gem "delayed_job" diff --git a/Gemfile.lock b/Gemfile.lock index 8d68288da..c9770a399 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,88 +12,90 @@ GIT GIT remote: git://github.com/rgrove/sanitize.git - revision: 4925ac8058320fa587b6bdd7556fdf76e2ad5d31 + revision: c45162d8a012cac3362ade7fadc3737095cb1a50 specs: sanitize (2.0.3) nokogiri (>= 1.4.4, < 1.6) GIT remote: http://github.com/EmmanuelOga/ffaker.git - revision: 48b4cf9bad4aa1e9e1fbcbda6b9bac66df4da475 + revision: ad249ace5ca8982440b5efb23bae8db1c274d61a specs: ffaker (1.15.0) GEM remote: http://gemcutter.org/ specs: - actionmailer (3.2.3) - actionpack (= 3.2.3) + actionmailer (3.2.11) + actionpack (= 3.2.11) mail (~> 2.4.4) - actionpack (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) + actionpack (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) builder (~> 3.0.0) erubis (~> 2.7.0) - journey (~> 1.0.1) + journey (~> 1.0.4) rack (~> 1.4.0) rack-cache (~> 1.2) rack-test (~> 0.6.1) - sprockets (~> 2.1.2) - activemodel (3.2.3) - activesupport (= 3.2.3) + sprockets (~> 2.2.1) + activemodel (3.2.11) + activesupport (= 3.2.11) builder (~> 3.0.0) - activerecord (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) + activerecord (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) - activesupport (3.2.3) + activeresource (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) + activesupport (3.2.11) i18n (~> 0.6) multi_json (~> 1.0) arel (3.0.2) - awesome_print (1.0.2) - builder (3.0.0) - chronic (0.6.7) - coderay (1.0.7) + awesome_print (1.1.0) + bourne (1.1.2) + mocha (= 0.10.5) + builder (3.0.4) + chronic (0.9.0) + coderay (1.0.8) daemons (1.1.9) - delayed_job (3.0.3) + delayed_job (3.0.4) activesupport (~> 3.0) - delayed_job_active_record (0.3.2) - activerecord (> 2.1.0) - delayed_job (~> 3.0.0) - domain_name (0.5.3) + delayed_job_active_record (0.3.3) + activerecord (>= 2.1.0, < 4) + delayed_job (~> 3.0) + domain_name (0.5.7) unf (~> 0.0.3) erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) - factory_girl (4.0.0) + factory_girl (4.1.0) activesupport (>= 3.0.0) hike (1.2.1) - i18n (0.6.0) + i18n (0.6.1) journey (1.0.4) - json (1.7.4) - libv8 (3.3.10.4) + json (1.7.6) + libv8 (3.11.8.13) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) memcache-client (1.8.5) metaclass (0.0.1) - method_source (0.8) + method_source (0.8.1) mime-types (1.19) - mocha (0.12.3) + mocha (0.10.5) metaclass (~> 0.0.1) - multi_json (1.3.6) + multi_json (1.5.0) net-http-digest_auth (1.2.1) - net-http-persistent (2.7) + net-http-persistent (2.8) net-sftp (2.0.5) net-ssh (>= 2.0.9) - net-ssh (2.6.2) - newrelic_rpm (3.4.1) - nokogiri (1.5.5) + net-ssh (2.6.3) + newrelic_rpm (3.5.5.38) + nokogiri (1.5.6) ntlm-http (0.1.1) pg (0.12.2) polyglot (0.3.3) @@ -101,76 +103,80 @@ GEM coderay (~> 1.0.5) method_source (~> 0.8) slop (~> 3.3.1) - rack (1.4.1) + rack (1.4.3) rack-cache (1.2) rack (>= 0.4) rack-ssl (1.3.2) rack - rack-test (0.6.1) + rack-test (0.6.2) rack (>= 1.0) - rails (3.2.3) - actionmailer (= 3.2.3) - actionpack (= 3.2.3) - activerecord (= 3.2.3) - activeresource (= 3.2.3) - activesupport (= 3.2.3) + rails (3.2.11) + actionmailer (= 3.2.11) + actionpack (= 3.2.11) + activerecord (= 3.2.11) + activeresource (= 3.2.11) + activesupport (= 3.2.11) bundler (~> 1.0) - railties (= 3.2.3) - railties (3.2.3) - actionpack (= 3.2.3) - activesupport (= 3.2.3) + railties (= 3.2.11) + railties (3.2.11) + actionpack (= 3.2.11) + activesupport (= 3.2.11) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) - thor (~> 0.14.6) - rake (0.9.2.2) + thor (>= 0.14.6, < 2.0) + rake (10.0.3) rdoc (3.12) json (~> 1.4) + ref (1.0.2) rmagick (2.13.1) - sass (3.2.1) + sass (3.2.5) sass-rails (3.2.5) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - shoulda (3.1.1) - shoulda-context (~> 1.0) - shoulda-matchers (~> 1.2) - shoulda-context (1.0.0) - shoulda-matchers (1.2.0) + shoulda (3.3.2) + shoulda-context (~> 1.0.1) + shoulda-matchers (~> 1.4.1) + shoulda-context (1.0.2) + shoulda-matchers (1.4.2) activesupport (>= 3.0.0) - simple_form (2.0.2) + bourne (~> 1.1.2) + simple_form (2.0.4) actionpack (~> 3.0) activemodel (~> 3.0) - simplecov (0.6.4) + simplecov (0.7.1) multi_json (~> 1.0) - simplecov-html (~> 0.5.3) - simplecov-html (0.5.3) - slop (3.3.2) - sprockets (2.1.3) + simplecov-html (~> 0.7.1) + simplecov-html (0.7.1) + slop (3.3.3) + sprockets (2.2.2) hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) super_exception_notifier (3.0.13) actionmailer rake - therubyracer (0.10.2) - libv8 (~> 3.3.10) - thor (0.14.6) + therubyracer (0.11.2) + libv8 (~> 3.11.8.12) + ref + thor (0.16.0) tilt (1.3.3) - treetop (1.4.10) + treetop (1.4.12) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.33) - uglifier (1.2.7) + tzinfo (0.3.35) + uglifier (1.3.0) execjs (>= 0.3.0) - multi_json (~> 1.3) + multi_json (~> 1.0, >= 1.0.2) unf (0.0.5) unf_ext unf_ext (0.0.5) webrobots (0.0.13) - whenever (0.7.3) + whenever (0.8.2) activesupport (>= 2.3.4) - chronic (~> 0.6.3) + chronic (>= 0.6.3) PLATFORMS ruby @@ -191,7 +197,7 @@ DEPENDENCIES nokogiri pg (= 0.12.2) pry - rails (= 3.2.3) + rails (= 3.2.11) rmagick sanitize! sass-rails