From c7f19eb5924a451d0d9d7f10c310d16feeff0b75 Mon Sep 17 00:00:00 2001 From: Jonne Hass Date: Sat, 19 Nov 2011 13:53:49 +0100 Subject: [PATCH] update to rails 3.0.11 --- Gemfile | 2 +- Gemfile.lock | 60 ++++++++++++++++++++++++++-------------------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Gemfile b/Gemfile index 2efbc6983..428351c97 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '3.0.10' +gem 'rails', '3.0.11' gem 'bundler', '>= 1.0.0' gem 'foreman' diff --git a/Gemfile.lock b/Gemfile.lock index fd73dbd54..38895b141 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -56,12 +56,12 @@ GEM Platform (0.4.0) SystemTimer (1.2.3) abstract (1.0.0) - actionmailer (3.0.10) - actionpack (= 3.0.10) + actionmailer (3.0.11) + actionpack (= 3.0.11) mail (~> 2.2.19) - actionpack (3.0.10) - activemodel (= 3.0.10) - activesupport (= 3.0.10) + actionpack (3.0.11) + activemodel (= 3.0.11) + activesupport (= 3.0.11) builder (~> 2.1.2) erubis (~> 2.6.6) i18n (~> 0.5.0) @@ -69,22 +69,22 @@ GEM rack-mount (~> 0.6.14) rack-test (~> 0.5.7) tzinfo (~> 0.3.23) - activemodel (3.0.10) - activesupport (= 3.0.10) + activemodel (3.0.11) + activesupport (= 3.0.11) builder (~> 2.1.2) i18n (~> 0.5.0) - activerecord (3.0.10) - activemodel (= 3.0.10) - activesupport (= 3.0.10) + activerecord (3.0.11) + activemodel (= 3.0.11) + activesupport (= 3.0.11) arel (~> 2.0.10) tzinfo (~> 0.3.23) activerecord-import (0.2.8) activerecord (~> 3.0pre) activerecord (~> 3.0pre) - activeresource (3.0.10) - activemodel (= 3.0.10) - activesupport (= 3.0.10) - activesupport (3.0.10) + activeresource (3.0.11) + activemodel (= 3.0.11) + activesupport (= 3.0.11) + activesupport (3.0.11) addressable (2.2.4) archive-tar-minitar (0.5.2) arel (2.0.10) @@ -246,7 +246,7 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) messagebus_ruby_api (0.4.8) - mime-types (1.16) + mime-types (1.17.2) mini_magick (3.2) subexec (~> 0.0.4) mixlib-authentication (1.1.4) @@ -330,7 +330,7 @@ GEM parallel (0.5.9) parallel_tests (0.6.7) parallel - polyglot (0.3.2) + polyglot (0.3.3) pyu-ruby-sasl (0.0.3.3) rack (1.2.4) rack-mobile-detect (0.3.0) @@ -342,26 +342,26 @@ GEM ruby-openid (>= 2.1.8) rack-test (0.5.7) rack (>= 1.0) - rails (3.0.10) - actionmailer (= 3.0.10) - actionpack (= 3.0.10) - activerecord (= 3.0.10) - activeresource (= 3.0.10) - activesupport (= 3.0.10) + rails (3.0.11) + actionmailer (= 3.0.11) + actionpack (= 3.0.11) + activerecord (= 3.0.11) + activeresource (= 3.0.11) + activesupport (= 3.0.11) bundler (~> 1.0) - railties (= 3.0.10) + railties (= 3.0.11) rails-i18n (0.1.10) i18n (~> 0.5) - railties (3.0.10) - actionpack (= 3.0.10) - activesupport (= 3.0.10) + railties (3.0.11) + actionpack (= 3.0.11) + activesupport (= 3.0.11) rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.4) - rake (0.9.2) + rake (0.9.2.2) rash (0.3.0) hashie (~> 1.0.0) - rdoc (3.10) + rdoc (3.11) json (~> 1.4) redcarpet (2.0.0b5) redis (2.2.2) @@ -451,7 +451,7 @@ GEM typhoeus (0.2.4) mime-types mime-types - tzinfo (0.3.30) + tzinfo (0.3.31) uuidtools (2.1.2) vegas (0.1.8) rack (>= 1.0.0) @@ -522,7 +522,7 @@ DEPENDENCIES ohai (= 0.5.8) omniauth (= 0.2.6) parallel_tests - rails (= 3.0.10) + rails (= 3.0.11) rails-i18n redcarpet (= 2.0.0b5) resque (= 1.10.0)