Created
October 7, 2011 19:21
-
-
Save jswanner/1271141 to your computer and use it in GitHub Desktop.
Differences between Rails 3.1.0.rc3 & Rails 3.1.1 generated apps
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -U 0 -r rails-3.1.0.rc3/config/application.rb rails-3.1.1/config/application.rb | |
--- rails-3.1.0.rc3/config/application.rb 2011-10-07 12:01:17.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 | |
@@ -40,0 +44,3 @@ | |
+ | |
+ # Version of your assets, change this if you want to expire all your assets | |
+ config.assets.version = '1.0' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -U 0 -r rails-3.1.0.rc3/config/environments/development.rb rails-3.1.1/config/environments/development.rb | |
--- rails-3.1.0.rc3/config/environments/development.rb 2011-10-07 12:01:17.000000000 -0400 | |
+++ rails-3.1.1/config/environments/development.rb 2011-10-07 12:59:13.000000000 -0400 | |
@@ -26,0 +27,3 @@ | |
+ | |
+ # Expands the lines which load the assets | |
+ config.assets.debug = true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -U 0 -r rails-3.1.0.rc3/Gemfile rails-3.1.1/Gemfile | |
--- rails-3.1.0.rc3/Gemfile 2011-10-07 12:01:17.000000000 -0400 | |
+++ rails-3.1.1/Gemfile 2011-10-07 12:59:13.000000000 -0400 | |
@@ -3 +3 @@ | |
-gem 'rails', '3.1.0.rc3' | |
+gem 'rails', '3.1.1' | |
@@ -10,4 +10,8 @@ | |
-# Asset template engines | |
-gem 'sass-rails', "~> 3.1.0.rc" | |
-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' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -U 0 -r rails-3.1.0.rc3/config/environments/production.rb rails-3.1.1/config/environments/production.rb | |
--- rails-3.1.0.rc3/config/environments/production.rb 2011-10-07 12:01:17.000000000 -0400 | |
+++ rails-3.1.1/config/environments/production.rb 2011-10-07 12:59:13.000000000 -0400 | |
@@ -17,2 +17,8 @@ | |
- # Specify the default JavaScript compressor | |
- config.assets.js_compressor = :uglifier | |
+ # 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 | |
@@ -21,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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -U 0 -r rails-3.1.0.rc3/config/initializers/wrap_parameters.rb rails-3.1.1/config/initializers/wrap_parameters.rb | |
--- rails-3.1.0.rc3/config/initializers/wrap_parameters.rb 2011-10-07 12:01:17.000000000 -0400 | |
+++ rails-3.1.1/config/initializers/wrap_parameters.rb 2011-10-07 12:59:13.000000000 -0400 | |
@@ -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