diff --git a/Gemfile b/Gemfile index 9b5044da1..2fa9d33a1 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'http://rubygems.org' gem 'bundler', '> 1.1.0' ruby '1.9.3' if ENV['HEROKU'] -gem 'rails', '3.2.6' +gem 'rails', '3.2.8' gem 'foreman', '0.46' diff --git a/Gemfile.lock b/Gemfile.lock index fcb23f67d..cc976fc81 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -59,34 +59,34 @@ GEM remote: http://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (3.2.6) - actionpack (= 3.2.6) + actionmailer (3.2.8) + actionpack (= 3.2.8) mail (~> 2.4.4) - actionpack (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) + 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.6) - activesupport (= 3.2.6) + activemodel (3.2.8) + activesupport (= 3.2.8) builder (~> 3.0.0) - activerecord (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) + activerecord (3.2.8) + activemodel (= 3.2.8) + activesupport (= 3.2.8) arel (~> 3.0.2) tzinfo (~> 0.3.29) activerecord-import (0.2.9) activerecord (~> 3.0) activerecord (~> 3.0) - activeresource (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) - activesupport (3.2.6) + 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_api (0.4) @@ -253,7 +253,7 @@ GEM jquery-ui-rails (0.2.2) jquery-rails railties (>= 3.1.0) - json (1.7.3) + json (1.7.5) kaminari (0.13.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -339,21 +339,21 @@ GEM rack rack-test (0.6.1) rack (>= 1.0) - rails (3.2.6) - actionmailer (= 3.2.6) - actionpack (= 3.2.6) - activerecord (= 3.2.6) - activeresource (= 3.2.6) - activesupport (= 3.2.6) + 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.6) + railties (= 3.2.8) rails-i18n (0.6.5) i18n (~> 0.5) rails_autolink (1.0.9) rails (~> 3.1) - railties (3.2.6) - actionpack (= 3.2.6) - activesupport (= 3.2.6) + railties (3.2.8) + actionpack (= 3.2.8) + activesupport (= 3.2.8) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -434,7 +434,7 @@ GEM daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.15.3) + thor (0.16.0) tilt (1.3.3) timecop (0.3.5) treetop (1.4.10) @@ -531,7 +531,7 @@ DEPENDENCIES rack-piwik rack-rewrite (~> 1.2.1) rack-ssl - rails (= 3.2.6) + rails (= 3.2.8) rails-i18n rails_admin! rails_autolink