Permalink
Browse files

Update to rails 3.2.9

  • Loading branch information...
1 parent afbfb20 commit f95bfa3a351f8429b689d154526d05888a2fe4c0 @sporkd committed Nov 29, 2012
View
@@ -3,3 +3,4 @@
Gemfile.lock
pkg/*
test/tmp
+vendor/bundle
View
@@ -2,7 +2,7 @@ source 'http://rubygems.org'
gemspec
-gem 'rails', '3.2.1'
+gem 'rails', '3.2.9'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
@@ -27,6 +27,6 @@ gem 'haml-rails'
group :test do
# Pretty printed test output
- gem 'turn', '0.8.2', :require => false
+ gem 'turn', :require => false
gem 'capybara'
end
View
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
s.rubyforge_project = "html5-rails"
- s.add_dependency "jquery-rails", ">= 1.0.19"
+ s.add_dependency "jquery-rails", ">= 2.0"
s.add_dependency "railties", "~> 3.1"
s.add_dependency "thor", "~> 0.14"
@@ -10,4 +10,4 @@
*
*= require_self
*= require_tree .
-*/
+ */
@@ -1,6 +1,12 @@
require File.expand_path('../boot', __FILE__)
-require 'rails/all'
+# Pick the frameworks you want:
+require "active_record/railtie"
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "active_resource/railtie"
+require "sprockets/railtie"
+# require "rails/test_unit/railtie"
if defined?(Bundler)
# If you precompile assets before deploying to production, use this line
@@ -41,6 +47,9 @@ class Application < Rails::Application
# Configure sensitive parameters which will be filtered from the log file.
config.filter_parameters += [:password]
+ # Enable escaping HTML in JSON.
+ config.active_support.escape_html_entities_in_json = true
+
# Use SQL instead of Active Record's schema dumper when creating the database.
# This is necessary if your schema can't be completely dumped by the schema dumper,
# like if you have constraints or database-specific column types
@@ -50,7 +59,7 @@ class Application < Rails::Application
# This will create an empty whitelist of attributes available for mass-assignment for all models
# in your app. As such, your models will need to explicitly whitelist or blacklist accessible
# parameters by using an attr_accessible or attr_protected declaration.
- # config.active_record.whitelist_attributes = true
+ config.active_record.whitelist_attributes = true
# Enable the asset pipeline
config.assets.enabled = true
@@ -2,7 +2,7 @@
# Settings specified here will take precedence over those in config/application.rb
# In the development environment your application's code is reloaded on
- # every request. This slows down response time but is perfect for development
+ # every request. This slows down response time but is perfect for development
# since you don't have to restart the web server when you make code changes.
config.cache_classes = false
@@ -20,7 +20,7 @@
# Generate digests for assets URLs
config.assets.digest = true
- # Defaults to Rails.root.join("public/assets")
+ # Defaults to nil and saved in location specified by config.assets.prefix
# config.assets.manifest = YOUR_PATH
# Specifies the header that your server uses for sending files

0 comments on commit f95bfa3

Please sign in to comment.