Create a gist now

Instantly share code, notes, and snippets.

What would you like to do?
Differences between Rails 3.1.0.rc1 & Rails 3.1.1 generated apps
diff -U 0 -r rails-3.1.0.rc1/config/application.rb rails-3.1.1/config/application.rb
--- rails-3.1.0.rc1/config/application.rb 2011-10-07 11:57:59.000000000 -0400
+++ rails-3.1.1/config/application.rb 2011-10-07 12:59:13.000000000 -0400
@@ -5,3 +5,6 @@
-# If you have a Gemfile, require the gems listed there, including any gems
-# you've limited to :test, :development, or :production.
-Bundler.require(:default, Rails.env) if defined?(Bundler)
+if defined?(Bundler)
+ # If you precompile assets before deploying to production, use this line
+ Bundler.require(*Rails.groups(:assets => %w(development test)))
+ # If you want your assets lazily compiled in production, use this line
+ # Bundler.require(:default, :assets, Rails.env)
+end
@@ -33,7 +35,0 @@
- # Please note that JavaScript expansions are *ignored altogether* if the asset
- # pipeline is enabled (see config.assets.enabled below). Put your defaults in
- # app/assets/javascripts/application.js in that case.
- #
- # JavaScript files you want as :defaults (application.js is always included).
- # config.action_view.javascript_expansions[:defaults] = %w(prototype prototype_ujs)
-
@@ -47,0 +44,3 @@
+
+ # Version of your assets, change this if you want to expire all your assets
+ config.assets.version = '1.0'
diff -U 0 -r rails-3.1.0.rc1/config/environments/development.rb rails-3.1.1/config/environments/development.rb
--- rails-3.1.0.rc1/config/environments/development.rb 2011-10-07 11:57:59.000000000 -0400
+++ rails-3.1.1/config/environments/development.rb 2011-10-07 12:59:13.000000000 -0400
@@ -23,0 +24,6 @@
+
+ # Do not compress assets
+ config.assets.compress = false
+
+ # Expands the lines which load the assets
+ config.assets.debug = true
diff -U 0 -r rails-3.1.0.rc1/Gemfile rails-3.1.1/Gemfile
--- rails-3.1.0.rc1/Gemfile 2011-10-07 11:57:59.000000000 -0400
+++ rails-3.1.1/Gemfile 2011-10-07 12:59:13.000000000 -0400
@@ -3 +3 @@
-gem 'rails', '3.1.0.rc1'
+gem 'rails', '3.1.1'
@@ -10,4 +10,8 @@
-# Asset template engines
-gem 'sass'
-gem 'coffee-script'
-gem 'uglifier'
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+ gem 'sass-rails', '~> 3.1.4'
+ gem 'coffee-rails', '~> 3.1.1'
+ gem 'uglifier', '>= 1.0.3'
+end
@@ -16,0 +21,3 @@
+# To use ActiveModel has_secure_password
+# gem 'bcrypt-ruby', '~> 3.0.0'
diff -U 0 -r rails-3.1.0.rc1/config/environments/production.rb rails-3.1.1/config/environments/production.rb
--- rails-3.1.0.rc1/config/environments/production.rb 2011-10-07 11:57:59.000000000 -0400
+++ rails-3.1.1/config/environments/production.rb 2011-10-07 12:59:13.000000000 -0400
@@ -14,3 +14,11 @@
- # Compress both stylesheets and JavaScripts
- config.assets.js_compressor = :uglifier
- config.assets.css_compressor = :scss
+ # Compress JavaScripts and CSS
+ config.assets.compress = true
+
+ # Don't fallback to assets pipeline if a precompiled asset is missed
+ config.assets.compile = false
+
+ # Generate digests for assets URLs
+ config.assets.digest = true
+
+ # Defaults to Rails.root.join("public/assets")
+ # config.assets.manifest = YOUR_PATH
@@ -19,2 +27,2 @@
- # (comment out if your front-end server doesn't support this)
- config.action_dispatch.x_sendfile_header = "X-Sendfile" # Use 'X-Accel-Redirect' for nginx
+ # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+ # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
diff -U 0 -r rails-3.1.0.rc1/config/initializers/wrap_parameters.rb rails-3.1.1/config/initializers/wrap_parameters.rb
--- rails-3.1.0.rc1/config/initializers/wrap_parameters.rb 2011-10-07 11:57:59.000000000 -0400
+++ rails-3.1.1/config/initializers/wrap_parameters.rb 2011-10-07 12:59:13.000000000 -0400
@@ -3,2 +3,2 @@
-# This file contains the settings for ActionController::ParametersWrapper
-# which will be enabled by default in the upcoming version of Ruby on Rails.
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
@@ -7 +7,3 @@
-ActionController::Base.wrap_parameters format: [:json]
+ActiveSupport.on_load(:action_controller) do
+ wrap_parameters format: [:json]
+end
@@ -10,2 +12,2 @@
-if defined?(ActiveRecord)
- ActiveRecord::Base.include_root_in_json = false
+ActiveSupport.on_load(:active_record) do
+ self.include_root_in_json = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment