diff --git a/Gemfile b/Gemfile index f9eaa6f1e9a..91c8395f6f9 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "http://rubygems.org" -gem "rails", "3.2.5" +gem "rails", "3.2.8" # Supported DBs gem "sqlite3" diff --git a/Gemfile.lock b/Gemfile.lock index ee8c8c8ca06..e1680805a8b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -69,31 +69,31 @@ GEM remote: http://rubygems.org/ specs: ZenTest (4.8.1) - actionmailer (3.2.5) - actionpack (= 3.2.5) + actionmailer (3.2.8) + actionpack (= 3.2.8) mail (~> 2.4.4) - actionpack (3.2.5) - activemodel (= 3.2.5) - activesupport (= 3.2.5) + actionpack (3.2.8) + activemodel (= 3.2.8) + activesupport (= 3.2.8) 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.3) - activemodel (3.2.5) - activesupport (= 3.2.5) + activemodel (3.2.8) + activesupport (= 3.2.8) builder (~> 3.0.0) - activerecord (3.2.5) - activemodel (= 3.2.5) - activesupport (= 3.2.5) + activerecord (3.2.8) + activemodel (= 3.2.8) + activesupport (= 3.2.8) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.5) - activemodel (= 3.2.5) - activesupport (= 3.2.5) - activesupport (3.2.5) + activeresource (3.2.8) + activemodel (= 3.2.8) + activesupport (= 3.2.8) + activesupport (3.2.8) i18n (~> 0.6) multi_json (~> 1.0) acts-as-taggable-on (2.3.1) @@ -189,14 +189,14 @@ GEM multi_json (~> 1.0) multi_xml i18n (0.6.0) - journey (1.0.3) + journey (1.0.4) jquery-rails (2.0.2) railties (>= 3.2.0, < 5.0) thor (~> 0.14) jquery-ui-rails (0.5.0) jquery-rails railties (>= 3.1.0) - json (1.7.3) + json (1.7.4) kaminari (0.13.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -214,7 +214,7 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) method_source (0.7.1) - mime-types (1.18) + mime-types (1.19) minitest (3.1.0) modernizr (2.5.3) sprockets (~> 2.0) @@ -247,19 +247,19 @@ GEM rack rack-test (0.6.1) rack (>= 1.0) - rails (3.2.5) - actionmailer (= 3.2.5) - actionpack (= 3.2.5) - activerecord (= 3.2.5) - activeresource (= 3.2.5) - activesupport (= 3.2.5) + rails (3.2.8) + actionmailer (= 3.2.8) + actionpack (= 3.2.8) + activerecord (= 3.2.8) + activeresource (= 3.2.8) + activesupport (= 3.2.8) bundler (~> 1.0) - railties (= 3.2.5) + railties (= 3.2.8) rails-footnotes (3.7.8) rails (>= 3.0.0) - railties (3.2.5) - actionpack (= 3.2.5) - activesupport (= 3.2.5) + railties (3.2.8) + actionpack (= 3.2.8) + activesupport (= 3.2.8) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -342,7 +342,7 @@ GEM daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.15.2) + thor (0.15.4) tilt (1.3.3) treetop (1.4.10) polyglot @@ -411,7 +411,7 @@ DEPENDENCIES pry pygments.rb! rack-mini-profiler - rails (= 3.2.5) + rails (= 3.2.8) rails-footnotes raphael-rails (= 1.5.2) redcarpet (~> 2.1.1)