Update rails dependency to version 3.2.0
This commit is contained in:
parent
7a02bfab8a
commit
4503f5d7d7
2
Gemfile
2
Gemfile
|
@ -1,6 +1,6 @@
|
|||
source 'https://rubygems.org'
|
||||
|
||||
gem 'rails', '~> 3.2.0.rc2'
|
||||
gem 'rails', '~> 3.2'
|
||||
|
||||
gem 'arel'
|
||||
gem 'devise'
|
||||
|
|
60
Gemfile.lock
60
Gemfile.lock
|
@ -1,6 +1,6 @@
|
|||
GIT
|
||||
remote: git://github.com/sferik/rails_admin.git
|
||||
revision: 34ac333dbdc8b1af2da24323caf04229cfa2ee67
|
||||
revision: d381ac95b1ea1a33c3b1671ff513e91879c324c4
|
||||
specs:
|
||||
rails_admin (0.0.1)
|
||||
bbenezech-nested_form (~> 0.0)
|
||||
|
@ -17,31 +17,31 @@ GIT
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actionmailer (3.2.0.rc2)
|
||||
actionpack (= 3.2.0.rc2)
|
||||
mail (~> 2.3.0)
|
||||
actionpack (3.2.0.rc2)
|
||||
activemodel (= 3.2.0.rc2)
|
||||
activesupport (= 3.2.0.rc2)
|
||||
actionmailer (3.2.0)
|
||||
actionpack (= 3.2.0)
|
||||
mail (~> 2.4.0)
|
||||
actionpack (3.2.0)
|
||||
activemodel (= 3.2.0)
|
||||
activesupport (= 3.2.0)
|
||||
builder (~> 3.0.0)
|
||||
erubis (~> 2.7.0)
|
||||
journey (~> 1.0.0.rc1)
|
||||
journey (~> 1.0.0)
|
||||
rack (~> 1.4.0)
|
||||
rack-cache (~> 1.1)
|
||||
rack-test (~> 0.6.1)
|
||||
sprockets (~> 2.1.2)
|
||||
activemodel (3.2.0.rc2)
|
||||
activesupport (= 3.2.0.rc2)
|
||||
activemodel (3.2.0)
|
||||
activesupport (= 3.2.0)
|
||||
builder (~> 3.0.0)
|
||||
activerecord (3.2.0.rc2)
|
||||
activemodel (= 3.2.0.rc2)
|
||||
activesupport (= 3.2.0.rc2)
|
||||
arel (~> 3.0.0.rc1)
|
||||
activerecord (3.2.0)
|
||||
activemodel (= 3.2.0)
|
||||
activesupport (= 3.2.0)
|
||||
arel (~> 3.0.0)
|
||||
tzinfo (~> 0.3.29)
|
||||
activeresource (3.2.0.rc2)
|
||||
activemodel (= 3.2.0.rc2)
|
||||
activesupport (= 3.2.0.rc2)
|
||||
activesupport (3.2.0.rc2)
|
||||
activeresource (3.2.0)
|
||||
activemodel (= 3.2.0)
|
||||
activesupport (= 3.2.0)
|
||||
activesupport (3.2.0)
|
||||
i18n (~> 0.6)
|
||||
multi_json (~> 1.0)
|
||||
addressable (2.2.6)
|
||||
|
@ -83,7 +83,7 @@ GEM
|
|||
actionpack (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
railties (>= 3.0.0)
|
||||
mail (2.3.0)
|
||||
mail (2.4.1)
|
||||
i18n (>= 0.4.0)
|
||||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
|
@ -104,17 +104,17 @@ GEM
|
|||
rack
|
||||
rack-test (0.6.1)
|
||||
rack (>= 1.0)
|
||||
rails (3.2.0.rc2)
|
||||
actionmailer (= 3.2.0.rc2)
|
||||
actionpack (= 3.2.0.rc2)
|
||||
activerecord (= 3.2.0.rc2)
|
||||
activeresource (= 3.2.0.rc2)
|
||||
activesupport (= 3.2.0.rc2)
|
||||
rails (3.2.0)
|
||||
actionmailer (= 3.2.0)
|
||||
actionpack (= 3.2.0)
|
||||
activerecord (= 3.2.0)
|
||||
activeresource (= 3.2.0)
|
||||
activesupport (= 3.2.0)
|
||||
bundler (~> 1.0)
|
||||
railties (= 3.2.0.rc2)
|
||||
railties (3.2.0.rc2)
|
||||
actionpack (= 3.2.0.rc2)
|
||||
activesupport (= 3.2.0.rc2)
|
||||
railties (= 3.2.0)
|
||||
railties (3.2.0)
|
||||
actionpack (= 3.2.0)
|
||||
activesupport (= 3.2.0)
|
||||
rack-ssl (~> 1.3.2)
|
||||
rake (>= 0.8.7)
|
||||
rdoc (~> 3.4)
|
||||
|
@ -169,7 +169,7 @@ DEPENDENCIES
|
|||
haml (~> 3.2.0.alpha)
|
||||
pg
|
||||
rack-contrib
|
||||
rails (~> 3.2.0.rc2)
|
||||
rails (~> 3.2)
|
||||
rails_admin!
|
||||
simplecov
|
||||
sqlite3
|
||||
|
|
|
@ -23,7 +23,7 @@ AdoptAThing::Application.configure do
|
|||
# Only use best-standards-support built into browsers
|
||||
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
|
||||
|
||||
# Log the query plan for queries taking more than this (works
|
||||
|
|
|
@ -30,7 +30,7 @@ AdoptAThing::Application.configure do
|
|||
config.action_mailer.delivery_method = :test
|
||||
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
|
||||
|
||||
# Print deprecation notices to the stderr
|
||||
|
|
Loading…
Reference in New Issue