From b030cbf6ac33ad3f973c3ec39b29e116d0ef1654 Mon Sep 17 00:00:00 2001 From: albert Date: Fri, 27 Jan 2012 17:15:46 -0500 Subject: [PATCH] upgraded to rails 3.2.1 --- Gemfile | 2 +- Gemfile.lock | 52 ++++++++++++++++++++--------------------- test/test_helper.rb | 4 +--- vendor/plugins/.gitkeep | 0 4 files changed, 28 insertions(+), 30 deletions(-) delete mode 100644 vendor/plugins/.gitkeep diff --git a/Gemfile b/Gemfile index 3ab8a7dc1..950457701 100644 --- a/Gemfile +++ b/Gemfile @@ -14,7 +14,7 @@ group :assets do gem "therubyracer" end -gem "rails", "3.2.0" +gem "rails", "3.2.1" gem "pg" gem "memcache-client", :require => "memcache" gem "delayed_job" diff --git a/Gemfile.lock b/Gemfile.lock index c368891b3..345c301d4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,31 +36,31 @@ GIT GEM remote: http://gemcutter.org/ specs: - actionmailer (3.2.0) - actionpack (= 3.2.0) + actionmailer (3.2.1) + actionpack (= 3.2.1) mail (~> 2.4.0) - actionpack (3.2.0) - activemodel (= 3.2.0) - activesupport (= 3.2.0) + actionpack (3.2.1) + activemodel (= 3.2.1) + activesupport (= 3.2.1) builder (~> 3.0.0) erubis (~> 2.7.0) - journey (~> 1.0.0) + journey (~> 1.0.1) rack (~> 1.4.0) rack-cache (~> 1.1) rack-test (~> 0.6.1) sprockets (~> 2.1.2) - activemodel (3.2.0) - activesupport (= 3.2.0) + activemodel (3.2.1) + activesupport (= 3.2.1) builder (~> 3.0.0) - activerecord (3.2.0) - activemodel (= 3.2.0) - activesupport (= 3.2.0) + activerecord (3.2.1) + activemodel (= 3.2.1) + activesupport (= 3.2.1) arel (~> 3.0.0) tzinfo (~> 0.3.29) - activeresource (3.2.0) - activemodel (= 3.2.0) - activesupport (= 3.2.0) - activesupport (3.2.0) + activeresource (3.2.1) + activemodel (= 3.2.1) + activesupport (= 3.2.1) + activesupport (3.2.1) i18n (~> 0.6) multi_json (~> 1.0) arel (3.0.0) @@ -115,17 +115,17 @@ GEM rack rack-test (0.6.1) rack (>= 1.0) - rails (3.2.0) - actionmailer (= 3.2.0) - actionpack (= 3.2.0) - activerecord (= 3.2.0) - activeresource (= 3.2.0) - activesupport (= 3.2.0) + rails (3.2.1) + actionmailer (= 3.2.1) + actionpack (= 3.2.1) + activerecord (= 3.2.1) + activeresource (= 3.2.1) + activesupport (= 3.2.1) bundler (~> 1.0) - railties (= 3.2.0) - railties (3.2.0) - actionpack (= 3.2.0) - activesupport (= 3.2.0) + railties (= 3.2.1) + railties (3.2.1) + actionpack (= 3.2.1) + activesupport (= 3.2.1) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -187,7 +187,7 @@ DEPENDENCIES nokogiri pg pry - rails (= 3.2.0) + rails (= 3.2.1) rmagick sanitize! sass diff --git a/test/test_helper.rb b/test/test_helper.rb index 4a5885de6..647c4ba6d 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -71,6 +71,4 @@ class MockMemcache end end -silence_warnings do - MEMCACHE = MockMemcache.new -end +MEMCACHE = MockMemcache.new diff --git a/vendor/plugins/.gitkeep b/vendor/plugins/.gitkeep deleted file mode 100644 index e69de29bb..000000000