diff --git a/Gemfile b/Gemfile index d53e4c24..64f53436 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ # A sample Gemfile source "http://rubygems.org" -gem "rails", '3.0.12' +gem "rails", '3.0.16' gem 'mysql2' gem "fastercsv" diff --git a/Gemfile.lock b/Gemfile.lock index bb46dc98..33831929 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,12 +8,12 @@ GEM remote: http://rubygems.org/ specs: abstract (1.0.0) - actionmailer (3.0.12) - actionpack (= 3.0.12) + actionmailer (3.0.16) + actionpack (= 3.0.16) mail (~> 2.2.19) - actionpack (3.0.12) - activemodel (= 3.0.12) - activesupport (= 3.0.12) + actionpack (3.0.16) + activemodel (= 3.0.16) + activesupport (= 3.0.16) builder (~> 2.1.2) erubis (~> 2.6.6) i18n (~> 0.5.0) @@ -21,19 +21,19 @@ GEM rack-mount (~> 0.6.14) rack-test (~> 0.5.7) tzinfo (~> 0.3.23) - activemodel (3.0.12) - activesupport (= 3.0.12) + activemodel (3.0.16) + activesupport (= 3.0.16) builder (~> 2.1.2) i18n (~> 0.5.0) - activerecord (3.0.12) - activemodel (= 3.0.12) - activesupport (= 3.0.12) + activerecord (3.0.16) + activemodel (= 3.0.16) + activesupport (= 3.0.16) arel (~> 2.0.10) tzinfo (~> 0.3.23) - activeresource (3.0.12) - activemodel (= 3.0.12) - activesupport (= 3.0.12) - activesupport (3.0.12) + activeresource (3.0.16) + activemodel (= 3.0.16) + activesupport (= 3.0.16) + activesupport (3.0.16) acts_as_configurable (0.0.8) arel (2.0.10) builder (2.1.2) @@ -53,7 +53,7 @@ GEM jquery-rails (1.0.1) railties (~> 3.0) thor (~> 0.14) - json (1.6.6) + json (1.7.4) mail (2.2.19) activesupport (>= 2.3.6) i18n (>= 0.4.0) @@ -68,7 +68,7 @@ GEM activerecord (~> 3.0.0) activesupport (~> 3.0.0) arel (~> 2.0.7) - mime-types (1.18) + mime-types (1.19) mysql2 (0.2.6) polyglot (0.3.3) prawn (0.6.3) @@ -86,19 +86,19 @@ GEM rack (>= 1.0.0) rack-test (0.5.7) rack (>= 1.0) - rails (3.0.12) - actionmailer (= 3.0.12) - actionpack (= 3.0.12) - activerecord (= 3.0.12) - activeresource (= 3.0.12) - activesupport (= 3.0.12) + rails (3.0.16) + actionmailer (= 3.0.16) + actionpack (= 3.0.16) + activerecord (= 3.0.16) + activeresource (= 3.0.16) + activesupport (= 3.0.16) bundler (~> 1.0) - railties (= 3.0.12) + railties (= 3.0.16) rails3_acts_as_paranoid (0.0.9) activerecord (~> 3.0) - railties (3.0.12) - actionpack (= 3.0.12) - activesupport (= 3.0.12) + railties (3.0.16) + actionpack (= 3.0.16) + activesupport (= 3.0.16) rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.4) @@ -134,7 +134,7 @@ DEPENDENCIES meta_where mysql2 prawn (<= 0.6.3) - rails (= 3.0.12) + rails (= 3.0.16) rails3_acts_as_paranoid (= 0.0.9) sass simple_form