Update rails dependency to version 3.2.0

This commit is contained in:
Erik Michaels-Ober 2012-01-20 09:05:34 -08:00
parent 7a02bfab8a
commit 4503f5d7d7
4 changed files with 33 additions and 33 deletions

View File

@ -1,6 +1,6 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'rails', '~> 3.2.0.rc2' gem 'rails', '~> 3.2'
gem 'arel' gem 'arel'
gem 'devise' gem 'devise'

View File

@ -1,6 +1,6 @@
GIT GIT
remote: git://github.com/sferik/rails_admin.git remote: git://github.com/sferik/rails_admin.git
revision: 34ac333dbdc8b1af2da24323caf04229cfa2ee67 revision: d381ac95b1ea1a33c3b1671ff513e91879c324c4
specs: specs:
rails_admin (0.0.1) rails_admin (0.0.1)
bbenezech-nested_form (~> 0.0) bbenezech-nested_form (~> 0.0)
@ -17,31 +17,31 @@ GIT
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (3.2.0.rc2) actionmailer (3.2.0)
actionpack (= 3.2.0.rc2) actionpack (= 3.2.0)
mail (~> 2.3.0) mail (~> 2.4.0)
actionpack (3.2.0.rc2) actionpack (3.2.0)
activemodel (= 3.2.0.rc2) activemodel (= 3.2.0)
activesupport (= 3.2.0.rc2) activesupport (= 3.2.0)
builder (~> 3.0.0) builder (~> 3.0.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
journey (~> 1.0.0.rc1) journey (~> 1.0.0)
rack (~> 1.4.0) rack (~> 1.4.0)
rack-cache (~> 1.1) rack-cache (~> 1.1)
rack-test (~> 0.6.1) rack-test (~> 0.6.1)
sprockets (~> 2.1.2) sprockets (~> 2.1.2)
activemodel (3.2.0.rc2) activemodel (3.2.0)
activesupport (= 3.2.0.rc2) activesupport (= 3.2.0)
builder (~> 3.0.0) builder (~> 3.0.0)
activerecord (3.2.0.rc2) activerecord (3.2.0)
activemodel (= 3.2.0.rc2) activemodel (= 3.2.0)
activesupport (= 3.2.0.rc2) activesupport (= 3.2.0)
arel (~> 3.0.0.rc1) arel (~> 3.0.0)
tzinfo (~> 0.3.29) tzinfo (~> 0.3.29)
activeresource (3.2.0.rc2) activeresource (3.2.0)
activemodel (= 3.2.0.rc2) activemodel (= 3.2.0)
activesupport (= 3.2.0.rc2) activesupport (= 3.2.0)
activesupport (3.2.0.rc2) activesupport (3.2.0)
i18n (~> 0.6) i18n (~> 0.6)
multi_json (~> 1.0) multi_json (~> 1.0)
addressable (2.2.6) addressable (2.2.6)
@ -83,7 +83,7 @@ GEM
actionpack (>= 3.0.0) actionpack (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
railties (>= 3.0.0) railties (>= 3.0.0)
mail (2.3.0) mail (2.4.1)
i18n (>= 0.4.0) i18n (>= 0.4.0)
mime-types (~> 1.16) mime-types (~> 1.16)
treetop (~> 1.4.8) treetop (~> 1.4.8)
@ -104,17 +104,17 @@ GEM
rack rack
rack-test (0.6.1) rack-test (0.6.1)
rack (>= 1.0) rack (>= 1.0)
rails (3.2.0.rc2) rails (3.2.0)
actionmailer (= 3.2.0.rc2) actionmailer (= 3.2.0)
actionpack (= 3.2.0.rc2) actionpack (= 3.2.0)
activerecord (= 3.2.0.rc2) activerecord (= 3.2.0)
activeresource (= 3.2.0.rc2) activeresource (= 3.2.0)
activesupport (= 3.2.0.rc2) activesupport (= 3.2.0)
bundler (~> 1.0) bundler (~> 1.0)
railties (= 3.2.0.rc2) railties (= 3.2.0)
railties (3.2.0.rc2) railties (3.2.0)
actionpack (= 3.2.0.rc2) actionpack (= 3.2.0)
activesupport (= 3.2.0.rc2) activesupport (= 3.2.0)
rack-ssl (~> 1.3.2) rack-ssl (~> 1.3.2)
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
@ -169,7 +169,7 @@ DEPENDENCIES
haml (~> 3.2.0.alpha) haml (~> 3.2.0.alpha)
pg pg
rack-contrib rack-contrib
rails (~> 3.2.0.rc2) rails (~> 3.2)
rails_admin! rails_admin!
simplecov simplecov
sqlite3 sqlite3

View File

@ -23,7 +23,7 @@ AdoptAThing::Application.configure do
# Only use best-standards-support built into browsers # Only use best-standards-support built into browsers
config.action_dispatch.best_standards_support = :builtin config.action_dispatch.best_standards_support = :builtin
# Raise exception on mass assignment protection for ActiveRecord models # Raise exception on mass assignment protection for Active Record models
config.active_record.mass_assignment_sanitizer = :strict config.active_record.mass_assignment_sanitizer = :strict
# Log the query plan for queries taking more than this (works # Log the query plan for queries taking more than this (works

View File

@ -30,7 +30,7 @@ AdoptAThing::Application.configure do
config.action_mailer.delivery_method = :test config.action_mailer.delivery_method = :test
config.action_mailer.default_url_options = {:host => 'localhost:3000'} config.action_mailer.default_url_options = {:host => 'localhost:3000'}
# Raise exception on mass assignment protection for ActiveRecord models # Raise exception on mass assignment protection for Active Record models
config.active_record.mass_assignment_sanitizer = :strict config.active_record.mass_assignment_sanitizer = :strict
# Print deprecation notices to the stderr # Print deprecation notices to the stderr