public
Created

Differences between Rails 3.1.0.beta1 & Rails 3.1.1 generated apps

  • Download Gist
.gitignore.diff
Diff
1 2 3
diff -r rails-3.1.0.beta1/.gitignore rails-3.1.1/.gitignore
4a5
> .sass-cache/
Gemfile.diff
Diff
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
diff -r rails-3.1.0.beta1/Gemfile rails-3.1.1/Gemfile
3c3
< gem 'rails', '3.1.0.beta1'
---
> gem 'rails', '3.1.1'
10,13c10,17
< # 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
16a21,23
> # To use ActiveModel has_secure_password
> # gem 'bcrypt-ruby', '~> 3.0.0'
>
application.rb.diff
Diff
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29
diff -r rails-3.1.0.beta1/config/application.rb rails-3.1.1/config/application.rb
5,7c5,10
< # 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,40d35
< # 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,49d41
< # Enable IdentityMap for Active Record, to disable set to false or remove the line below.
< config.active_record.identity_map = true
<
51a44,46
>
> # Version of your assets, change this if you want to expire all your assets
> config.assets.version = '1.0'
development.rb.diff
Diff
1 2 3 4 5 6 7 8 9 10
diff -r rails-3.1.0.beta1/config/environments/development.rb rails-3.1.1/config/environments/development.rb
24d23
< end
25a25,30
> # Do not compress assets
> config.assets.compress = false
>
> # Expands the lines which load the assets
> config.assets.debug = true
> end
production.rb.diff
Diff
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27
diff -r rails-3.1.0.beta1/config/environments/production.rb rails-3.1.1/config/environments/production.rb
14,16c14,24
< # 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,20c27,28
< # (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
34c42
< # Enable serving of images, stylesheets, and javascripts from an asset server
---
> # Enable serving of images, stylesheets, and JavaScripts from an asset server
wrap_parameters.rb.diff
Diff
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21
diff -r rails-3.1.0.beta1/config/initializers/wrap_parameters.rb rails-3.1.1/config/initializers/wrap_parameters.rb
3,4c3,4
< # 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.
6,7c6,9
< # Enable parameter wrapping for JSON. You can disable this by set :format to empty array.
< ActionController::Base.wrap_parameters :format => [:json]
---
> # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
> ActiveSupport.on_load(:action_controller) do
> wrap_parameters format: [:json]
> end
10,11c12,13
< if defined?(ActiveRecord)
< ActiveRecord::Base.include_root_in_json = false
---
> ActiveSupport.on_load(:active_record) do
> self.include_root_in_json = false

Please sign in to comment on this gist.

Something went wrong with that request. Please try again.