Skip to content

Instantly share code, notes, and snippets.

@jswanner
Created October 7, 2011 19:26
Show Gist options
  • Save jswanner/1271149 to your computer and use it in GitHub Desktop.
Save jswanner/1271149 to your computer and use it in GitHub Desktop.
Differences between Rails 3.1.0.rc6 & Rails 3.1.1 generated apps
diff -U 0 -r rails-3.1.0.rc6/config/application.rb rails-3.1.1/config/application.rb
--- rails-3.1.0.rc6/config/application.rb 2011-10-07 12:04:34.000000000 -0400
+++ rails-3.1.1/config/application.rb 2011-10-07 12:59:13.000000000 -0400
@@ -7 +7 @@
- Bundler.require *Rails.groups(:assets => %w(development test))
+ Bundler.require(*Rails.groups(:assets => %w(development test)))
@@ -43,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.rc6/config/environments/development.rb rails-3.1.1/config/environments/development.rb
--- rails-3.1.0.rc6/config/environments/development.rb 2011-10-07 12:04:34.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
diff -U 0 -r rails-3.1.0.rc6/Gemfile rails-3.1.1/Gemfile
--- rails-3.1.0.rc6/Gemfile 2011-10-07 12:04:34.000000000 -0400
+++ rails-3.1.1/Gemfile 2011-10-07 12:59:13.000000000 -0400
@@ -3 +3 @@
-gem 'rails', '3.1.0.rc6'
+gem 'rails', '3.1.1'
@@ -14,3 +14,3 @@
- gem 'sass-rails', " ~> 3.1.0.rc"
- gem 'coffee-rails', "~> 3.1.0.rc"
- gem 'uglifier'
+ gem 'sass-rails', '~> 3.1.4'
+ gem 'coffee-rails', '~> 3.1.1'
+ gem 'uglifier', '>= 1.0.3'
@@ -20,0 +21,3 @@
+# To use ActiveModel has_secure_password
+# gem 'bcrypt-ruby', '~> 3.0.0'
diff -U 0 -r rails-3.1.0.rc6/config/environments/production.rb rails-3.1.1/config/environments/production.rb
--- rails-3.1.0.rc6/config/environments/production.rb 2011-10-07 12:04:34.000000000 -0400
+++ rails-3.1.1/config/environments/production.rb 2011-10-07 12:59:13.000000000 -0400
@@ -16,0 +17,9 @@
+ # 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment