diff --git a/Gemfile b/Gemfile index ca29eaf1d..6ff2bc6e0 100644 --- a/Gemfile +++ b/Gemfile @@ -14,7 +14,7 @@ group :assets do gem "therubyracer" end -gem "rails", "3.2.11" +gem "rails", "3.2.12" gem "pg", "0.12.2" gem "memcache-client", :require => "memcache" gem "delayed_job" diff --git a/Gemfile.lock b/Gemfile.lock index 93edb0e7d..faabf9931 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,45 +12,45 @@ GIT GIT remote: git://github.com/rgrove/sanitize.git - revision: c45162d8a012cac3362ade7fadc3737095cb1a50 + revision: e20bd78860fc2140745477cb9937920fb54be5e1 specs: sanitize (2.0.3) nokogiri (>= 1.4.4, < 1.6) GIT remote: http://github.com/EmmanuelOga/ffaker.git - revision: ad249ace5ca8982440b5efb23bae8db1c274d61a + revision: ff12b3e71f51c71893e3fd593957463fa09f1f5d specs: ffaker (1.15.0) GEM remote: http://gemcutter.org/ specs: - actionmailer (3.2.11) - actionpack (= 3.2.11) + actionmailer (3.2.12) + actionpack (= 3.2.12) mail (~> 2.4.4) - actionpack (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) + actionpack (3.2.12) + activemodel (= 3.2.12) + activesupport (= 3.2.12) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) - rack (~> 1.4.0) + rack (~> 1.4.5) rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.11) - activesupport (= 3.2.11) + activemodel (3.2.12) + activesupport (= 3.2.12) builder (~> 3.0.0) - activerecord (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) + activerecord (3.2.12) + activemodel (= 3.2.12) + activesupport (= 3.2.12) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) - activesupport (3.2.11) + activeresource (3.2.12) + activemodel (= 3.2.12) + activesupport (= 3.2.12) + activesupport (3.2.12) i18n (~> 0.6) multi_json (~> 1.0) arel (3.0.2) @@ -61,9 +61,9 @@ GEM chronic (0.9.0) coderay (1.0.8) daemons (1.1.9) - delayed_job (3.0.4) + delayed_job (3.0.5) activesupport (~> 3.0) - delayed_job_active_record (0.3.3) + delayed_job_active_record (0.4.1) activerecord (>= 2.1.0, < 4) delayed_job (~> 3.0) domain_name (0.5.7) @@ -71,12 +71,12 @@ GEM erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) - factory_girl (4.1.0) + factory_girl (4.2.0) activesupport (>= 3.0.0) hike (1.2.1) i18n (0.6.1) journey (1.0.4) - json (1.7.6) + json (1.7.7) libv8 (3.11.8.13) mail (2.4.4) i18n (>= 0.4.0) @@ -85,52 +85,52 @@ GEM memcache-client (1.8.5) metaclass (0.0.1) method_source (0.8.1) - mime-types (1.19) + mime-types (1.21) mocha (0.10.5) metaclass (~> 0.0.1) - multi_json (1.5.0) + multi_json (1.6.0) net-http-digest_auth (1.2.1) net-http-persistent (2.8) - net-sftp (2.0.5) - net-ssh (>= 2.0.9) - net-ssh (2.6.3) + net-sftp (2.1.1) + net-ssh (>= 2.6.5) + net-ssh (2.6.5) nokogiri (1.5.6) ntlm-http (0.1.1) pg (0.12.2) polyglot (0.3.3) - pry (0.9.10) + pry (0.9.12) coderay (~> 1.0.5) method_source (~> 0.8) - slop (~> 3.3.1) - rack (1.4.4) + slop (~> 3.4) + rack (1.4.5) rack-cache (1.2) rack (>= 0.4) - rack-ssl (1.3.2) + rack-ssl (1.3.3) rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.11) - actionmailer (= 3.2.11) - actionpack (= 3.2.11) - activerecord (= 3.2.11) - activeresource (= 3.2.11) - activesupport (= 3.2.11) + rails (3.2.12) + actionmailer (= 3.2.12) + actionpack (= 3.2.12) + activerecord (= 3.2.12) + activeresource (= 3.2.12) + activesupport (= 3.2.12) bundler (~> 1.0) - railties (= 3.2.11) - railties (3.2.11) - actionpack (= 3.2.11) - activesupport (= 3.2.11) + railties (= 3.2.12) + railties (3.2.12) + actionpack (= 3.2.12) + activesupport (= 3.2.12) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) rake (10.0.3) - rdoc (3.12) + rdoc (3.12.1) json (~> 1.4) ref (1.0.2) - rmagick (2.13.1) + rmagick (2.13.2) sass (3.2.5) - sass-rails (3.2.5) + sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) @@ -148,7 +148,7 @@ GEM multi_json (~> 1.0) simplecov-html (~> 0.7.1) simplecov-html (0.7.1) - slop (3.3.3) + slop (3.4.3) sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) @@ -157,10 +157,10 @@ GEM super_exception_notifier (3.0.13) actionmailer rake - therubyracer (0.11.2) + therubyracer (0.11.3) libv8 (~> 3.11.8.12) ref - thor (0.16.0) + thor (0.17.0) tilt (1.3.3) treetop (1.4.12) polyglot @@ -195,7 +195,7 @@ DEPENDENCIES nokogiri pg (= 0.12.2) pry - rails (= 3.2.11) + rails (= 3.2.12) rmagick sanitize! sass-rails