diff --git a/Gemfile b/Gemfile index d41ca8e221..8de31921bc 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem "rails", "3.0.7" +gem "rails", "3.0.10" gem "pg", "0.11" gem "sequel", "3.26.0" diff --git a/Gemfile.lock b/Gemfile.lock index 0ea706c4ff..28c9d00434 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,12 +2,12 @@ GEM remote: http://rubygems.org/ specs: abstract (1.0.0) - actionmailer (3.0.7) - actionpack (= 3.0.7) - mail (~> 2.2.15) - actionpack (3.0.7) - activemodel (= 3.0.7) - activesupport (= 3.0.7) + actionmailer (3.0.10) + actionpack (= 3.0.10) + mail (~> 2.2.19) + actionpack (3.0.10) + activemodel (= 3.0.10) + activesupport (= 3.0.10) builder (~> 2.1.2) erubis (~> 2.6.6) i18n (~> 0.5.0) @@ -15,19 +15,19 @@ GEM rack-mount (~> 0.6.14) rack-test (~> 0.5.7) tzinfo (~> 0.3.23) - activemodel (3.0.7) - activesupport (= 3.0.7) + activemodel (3.0.10) + activesupport (= 3.0.10) builder (~> 2.1.2) i18n (~> 0.5.0) - activerecord (3.0.7) - activemodel (= 3.0.7) - activesupport (= 3.0.7) - arel (~> 2.0.2) + activerecord (3.0.10) + activemodel (= 3.0.10) + activesupport (= 3.0.10) + arel (~> 2.0.10) tzinfo (~> 0.3.23) - activeresource (3.0.7) - activemodel (= 3.0.7) - activesupport (= 3.0.7) - activesupport (3.0.7) + activeresource (3.0.10) + activemodel (= 3.0.10) + activesupport (= 3.0.10) + activesupport (3.0.10) addressable (2.2.6) airbrake (3.0.4) activesupport @@ -98,29 +98,31 @@ GEM oauth (>= 0.4.4) pg (0.11.0) polyglot (0.3.2) - rack (1.2.3) + rack (1.2.4) rack-mount (0.6.14) rack (>= 1.0.0) rack-reverse-proxy (0.4.1) rack (>= 1.0.0) rack-test (0.5.7) rack (>= 1.0) - rails (3.0.7) - actionmailer (= 3.0.7) - actionpack (= 3.0.7) - activerecord (= 3.0.7) - activeresource (= 3.0.7) - activesupport (= 3.0.7) + rails (3.0.10) + actionmailer (= 3.0.10) + actionpack (= 3.0.10) + activerecord (= 3.0.10) + activeresource (= 3.0.10) + activesupport (= 3.0.10) bundler (~> 1.0) - railties (= 3.0.7) + railties (= 3.0.10) rails_warden (0.5.2) warden - railties (3.0.7) - actionpack (= 3.0.7) - activesupport (= 3.0.7) + railties (3.0.10) + actionpack (= 3.0.10) + activesupport (= 3.0.10) rake (>= 0.8.7) + rdoc (~> 3.4) thor (~> 0.14.4) rake (0.9.2) + rdoc (3.9.4) redis (2.2.2) redis-namespace (1.0.3) redis (< 3.0.0) @@ -220,7 +222,7 @@ DEPENDENCIES oauth-plugin (= 0.4.0.pre4) pg (= 0.11) rack-reverse-proxy (~> 0.4.1) - rails (= 3.0.7) + rails (= 3.0.10) rails_warden (= 0.5.2) redis (~> 2.2.2) resque (~> 1.19.0)