rails 4.1.0.beta2 → 4.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4028ec4234df00141d26ba89be0adc8d980b706
-  data.tar.gz: 838329499178162cc2dfd97197fbb25e2aa11664
+  metadata.gz: f7621750645b2b3623245eeecac73b517d827c5e
+  data.tar.gz: b90a28e976f9af320a80b48f06a28d0e82d507aa
 SHA512:
-  metadata.gz: 6b6b8f9f1f802663a615ab1e9c7bb374b04aa7d921cdbfa2bc88cfbd227f962a2e149858483517739d352e020717598cbe88185c10bb8d26e42edfc438851f95
-  data.tar.gz: 8ca8789360374e6e9e8d6902d32e6b2d1bc8978067899fb82a575a895a681b761c495a5d3fe9f9e7962fe3da16068b2e90431f7667431eb01b484ff7a0002978
+  metadata.gz: 63d3210259a8630b1ff4c840753ea77424a8fd7489d687ee5de9fbc5e7f036848a332878110b1a9de7f46f0935595611b14ea34f43db4b2e919267b9e67741e9
+  data.tar.gz: 4151069e5546e83879a544aa25d34494930879893565d60bfe3a31a495e5439c630fb5781cc36a77df1e69d654fed2e53c135a782fac622b4f0d38b8c177b5bf

data/README.md

@@ -59,7 +59,8 @@ independently outside Rails.
 
    Run with `--help` or `-h` for options.
 
-4. Using a browser, go to http://localhost:3000 and you'll see: "Welcome aboard: You're riding Ruby on Rails!"
+4. Using a browser, go to `http://localhost:3000` and you'll see:
+"Welcome aboard: You're riding Ruby on Rails!"
 
 5. Follow the guidelines to start developing your application. You may find
    the following resources handy:
@@ -75,8 +76,7 @@ We encourage you to contribute to Ruby on Rails! Please check out the
 
 ## Code Status
 
-* [![Build Status](https://api.travis-ci.org/rails/rails.png)](https://travis-ci.org/rails/rails)
-* [![Dependencies](https://gemnasium.com/rails/rails.png?travis)](https://gemnasium.com/rails/rails)
+* [![Build Status](https://travis-ci.org/rails/rails.png?branch=master)](https://travis-ci.org/rails/rails)
 
 ## License
 

data/guides/bug_report_templates/action_controller_gem.rb

@@ -29,7 +29,10 @@ end
 require 'minitest/autorun'
 require 'rack/test'
 
-class BugTest < MiniTest::Unit::TestCase
+# Ensure backward compatibility with Minitest 4
+Minitest::Test = MiniTest::Unit::TestCase unless defined?(Minitest::Test)
+
+class BugTest < Minitest::Test
   include Rack::Test::Methods
 
   def test_returns_success
@@ -41,4 +44,4 @@ class BugTest < MiniTest::Unit::TestCase
     def app
       Rails.application
     end
-end
+end

data/guides/bug_report_templates/active_record_gem.rb

@@ -4,6 +4,9 @@ require 'active_record'
 require 'minitest/autorun'
 require 'logger'
 
+# Ensure backward compatibility with Minitest 4
+Minitest::Test = MiniTest::Unit::TestCase unless defined?(Minitest::Test)
+
 # This connection will do for database-independent bug reports.
 ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
 ActiveRecord::Base.logger = Logger.new(STDOUT)
@@ -25,7 +28,7 @@ class Comment < ActiveRecord::Base
   belongs_to :post
 end
 
-class BugTest < MiniTest::Unit::TestCase
+class BugTest < Minitest::Test
   def test_association_stuff
     post = Post.create!
     post.comments << Comment.create!

data/guides/code/getting_started/Gemfile

@@ -1,43 +1,40 @@
 source 'https://rubygems.org'
 
-gem 'rails', '4.0.0'
 
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '4.1.0'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3'
-
 # Use SCSS for stylesheets
-gem 'sass-rails'
-
+gem 'sass-rails', '~> 4.0.1'
+# Use Uglifier as compressor for JavaScript assets
+gem 'uglifier', '>= 1.3.0'
 # Use CoffeeScript for .js.coffee assets and views
-gem 'coffee-rails'
-
+gem 'coffee-rails', '~> 4.0.0'
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-# gem 'therubyracer', platforms: :ruby
-
-# Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '>= 1.0.3'
+# gem 'therubyracer',  platforms: :ruby
 
+# Use jquery as the JavaScript library
 gem 'jquery-rails'
-
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
 gem 'turbolinks'
-
-group :doc do
-  # bundle exec rake doc:rails generates the API under doc/api.
-  gem 'sdoc', require: false
-end
-
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 1.2'
+gem 'jbuilder', '~> 2.0'
+# bundle exec rake doc:rails generates the API under doc/api.
+gem 'sdoc', '~> 0.4.0',          group: :doc
 
-# To use ActiveModel has_secure_password
+# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+gem 'spring',        group: :development
+
+# Use ActiveModel has_secure_password
 # gem 'bcrypt-ruby', '~> 3.1.2'
 
 # Use unicorn as the app server
 # gem 'unicorn'
 
-# Deploy with Capistrano
-# gem 'capistrano', group: :development
+# Use Capistrano for deployment
+# gem 'capistrano-rails', group: :development
+
+# Use debugger
+# gem 'debugger', group: [:development, :test]
 
-# To use debugger
-# gem 'debugger'

data/guides/code/getting_started/Gemfile.lock

@@ -1,120 +1,126 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.0)
-      actionpack (= 4.0.0)
-      mail (~> 2.5.3)
-    actionpack (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
+    actionmailer (4.1.0)
+      actionpack (= 4.1.0)
+      actionview (= 4.1.0)
+      mail (~> 2.5.4)
+    actionpack (4.1.0)
+      actionview (= 4.1.0)
+      activesupport (= 4.1.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-    activerecord (4.0.0)
-      activemodel (= 4.0.0)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    actionview (4.1.0)
+      activesupport (= 4.1.0)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.0)
+      activesupport (= 4.1.0)
+      builder (~> 3.1)
+    activerecord (4.1.0)
+      activemodel (= 4.1.0)
+      activesupport (= 4.1.0)
+      arel (~> 5.0.0)
+    activesupport (4.1.0)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.0)
-    atomic (1.1.10)
-    builder (3.1.4)
-    coffee-rails (4.0.0)
+      tzinfo (~> 1.1)
+    arel (5.0.0)
+    atomic (1.1.14)
+    builder (3.2.2)
+    coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0.beta, < 5.0)
+      railties (>= 4.0.0, < 5.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script-source (1.6.3)
     erubis (2.7.0)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
+    execjs (2.0.2)
     hike (1.2.3)
-    i18n (0.6.4)
-    jbuilder (1.4.2)
+    i18n (0.6.9)
+    jbuilder (2.0.2)
       activesupport (>= 3.0.0)
       multi_json (>= 1.2.0)
-    jquery-rails (3.0.2)
+    jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.0)
+    json (1.8.1)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.23)
-    minitest (4.7.5)
-    multi_json (1.7.7)
+    mime-types (1.25.1)
+    minitest (5.2.1)
+    multi_json (1.8.4)
     polyglot (0.3.3)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.0)
-      actionmailer (= 4.0.0)
-      actionpack (= 4.0.0)
-      activerecord (= 4.0.0)
-      activesupport (= 4.0.0)
+    rails (4.1.0)
+      actionmailer (= 4.1.0)
+      actionpack (= 4.1.0)
+      actionview (= 4.1.0)
+      activemodel (= 4.1.0)
+      activerecord (= 4.1.0)
+      activesupport (= 4.1.0)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.0)
+      railties (= 4.1.0)
       sprockets-rails (~> 2.0.0)
-    railties (4.0.0)
-      actionpack (= 4.0.0)
-      activesupport (= 4.0.0)
+    railties (4.1.0)
+      actionpack (= 4.1.0)
+      activesupport (= 4.1.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.0)
-    rdoc (3.12.2)
+    rake (10.1.1)
+    rdoc (4.1.1)
       json (~> 1.4)
-    sass (3.2.9)
-    sass-rails (4.0.0)
-      railties (>= 4.0.0.beta, < 5.0)
+    sass (3.2.13)
+    sass-rails (4.0.1)
+      railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
       sprockets-rails (~> 2.0.0)
-    sdoc (0.3.20)
-      json (>= 1.1.3)
-      rdoc (~> 3.10)
-    sprockets (2.10.0)
+    sdoc (0.4.0)
+      json (~> 1.8)
+      rdoc (~> 4.0, < 5.0)
+    spring (1.0.0)
+    sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.0)
+    sprockets-rails (2.0.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    sqlite3 (1.3.7)
+    sqlite3 (1.3.8)
     thor (0.18.1)
-    thread_safe (0.1.0)
+    thread_safe (0.1.3)
       atomic
     tilt (1.4.1)
-    treetop (1.4.14)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    turbolinks (1.2.0)
+    turbolinks (2.2.0)
       coffee-rails
-    tzinfo (0.3.37)
-    uglifier (2.1.1)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
+    uglifier (2.4.0)
       execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
+      json (>= 1.8.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  coffee-rails
-  jbuilder (~> 1.2)
+  coffee-rails (~> 4.0.0)
+  jbuilder (~> 2.0)
   jquery-rails
-  rails (= 4.0.0)
-  sass-rails
-  sdoc
+  rails (= 4.1.0)
+  sass-rails (~> 4.0.1)
+  sdoc (~> 0.4.0)
+  spring
   sqlite3
   turbolinks
-  uglifier (>= 1.0.3)
+  uglifier (>= 1.3.0)

data/guides/code/getting_started/app/views/layouts/application.html.erb

@@ -2,8 +2,8 @@
 <html>
 <head>
   <title>Blog</title>
-  <%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
-  <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
+  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
+  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
   <%= csrf_meta_tags %>
 </head>
 <body>

data/guides/code/getting_started/config/environments/production.rb

@@ -5,7 +5,7 @@ Blog::Application.configure do
   config.cache_classes = true
 
   # Eager load code on boot. This eager loads most of Rails and
-  # your application in memory, allowing both thread web servers
+  # your application in memory, allowing both threaded web servers
   # and those relying on copy on write to perform better.
   # Rake tasks automatically ignore this option for performance.
   config.eager_load = true
@@ -66,7 +66,7 @@ Blog::Application.configure do
   # config.action_mailer.raise_delivery_errors = false
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found).
+  # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = true
 
   # Send deprecation notices to registered listeners.

data/guides/code/getting_started/config/environments/test.rb

@@ -14,7 +14,7 @@ Blog::Application.configure do
 
   # Configure static asset server for tests with Cache-Control for performance.
   config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
+  config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

data/guides/rails_guides/helpers.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 module RailsGuides
   module Helpers
     def guide(name, url, options = {}, &block)

data/guides/source/3_0_release_notes.md

@@ -574,7 +574,7 @@ The following methods have been removed because they are no longer used in the f
 Action Mailer
 -------------
 
-Action Mailer has been given a new API with TMail being replaced out with the new [Mail](http://github.com/mikel/mail) as the Email library. Action Mailer itself has been given an almost complete re-write with pretty much every line of code touched. The result is that Action Mailer now simply inherits from Abstract Controller and wraps the Mail gem in a Rails DSL. This reduces the amount of code and duplication of other libraries in Action Mailer considerably.
+Action Mailer has been given a new API with TMail being replaced out with the new [Mail](http://github.com/mikel/mail) as the email library. Action Mailer itself has been given an almost complete re-write with pretty much every line of code touched. The result is that Action Mailer now simply inherits from Abstract Controller and wraps the Mail gem in a Rails DSL. This reduces the amount of code and duplication of other libraries in Action Mailer considerably.
 
 * All mailers are now in `app/mailers` by default.
 * Can now send email using new API with three methods: `attachments`, `headers` and `mail`.

data/guides/source/4_1_release_notes.md

@@ -30,7 +30,7 @@ guide.
 Major Features
 --------------
 
-### Spring application preloader
+### Spring Application Preloader
 
 Spring is a Rails application preloader. It speeds up development by keeping
 your application running in the background so you don't need to boot it every
@@ -40,27 +40,19 @@ New Rails 4.1 applications will ship with "springified" binstubs. This means
 that `bin/rails` and `bin/rake` will automatically take advantage of preloaded
 spring environments.
 
-**running rake tasks:**
+**Running rake tasks:**
 
 ```
-bin/rake routes
+bin/rake test:models
 ```
 
-**running tests:**
-
-```
-bin/rake test
-bin/rake test test/models
-bin/rake test test/models/user_test.rb
-```
-
-**running a console:**
+**Running a Rails command:**
 
 ```
 bin/rails console
 ```
 
-**spring introspection:**
+**Spring introspection:**
 
 ```
 $ bin/spring status
@@ -72,7 +64,7 @@ Spring is running:
 ```
 
 Have a look at the
-[Spring README](https://github.com/jonleighton/spring/blob/master/README.md) to
+[Spring README](https://github.com/rails/spring/blob/master/README.md) to
 see all available features.
 
 See the [Upgrading Ruby on Rails](upgrading_ruby_on_rails.html#spring)
@@ -80,13 +72,12 @@ guide on how to migrate existing applications to use this feature.
 
 ### `config/secrets.yml`
 
-Rails 4.1 will generate a new `secrets.yml` file in the `config` folder for new
-applications. By default, this file contains the application's `secret_key_base`,
-but it could also be used to store other secrets such as access keys for external
-APIs.
+Rails 4.1 generates a new `secrets.yml` file in the `config` folder. By default,
+this file contains the application's `secret_key_base`, but it could also be
+used to store other secrets such as access keys for external APIs.
 
-The secrets added to this file will be accessible via `Rails.application.secrets`.
-For example, with the following `secrets.yml`:
+The secrets added to this file are accessible via `Rails.application.secrets`.
+For example, with the following `config/secrets.yml`:
 
 ```yaml
 development:
@@ -94,16 +85,16 @@ development:
   some_api_key: SOMEKEY
 ```
 
-`Rails.application.secrets.some_api_key` will return `SOMEKEY` in the development
+`Rails.application.secrets.some_api_key` returns `SOMEKEY` in the development
 environment.
 
 See the [Upgrading Ruby on Rails](upgrading_ruby_on_rails.html#config-secrets-yml)
 guide on how to migrate existing applications to use this feature.
 
-### Action Pack variants
+### Action Pack Variants
 
-We often want to render different html/json/xml templates for phones,
-tablets, and desktop browsers. Variants makes it easy.
+We often want to render different HTML/JSON/XML templates for phones,
+tablets, and desktop browsers. Variants make it easy.
 
 The request variant is a specialization of the request format, like `:tablet`,
 `:phone`, or `:desktop`.
@@ -143,24 +134,30 @@ respond_to do |format|
 end
 ```
 
-### Action Mailer previews
+### Action Mailer Previews
 
-Preview email templates in the browser without delivering them.
+Action Mailer previews provide a way to visually see how emails look by visiting
+a special URL that renders them.
+
+You implement a preview class whose methods return the mail object you'd like
+to check:
 
 ```ruby
 class NotifierPreview < ActionMailer::Preview
-  # Accessible from http://localhost:3000/rails/mailers/notifier/welcome
   def welcome
     Notifier.welcome(User.first)
   end
 end
 ```
 
-By default, these preview files live in <tt>test/mailers/previews</tt>.
-This can be configured using the <tt>preview_path</tt> option.
+The preview is available in http://localhost:3000/rails/mailers/notifier/welcome,
+and a list of them in http://localhost:3000/rails/mailers.
+
+By default, these preview classes live in `test/mailers/previews`.
+This can be configured using the `preview_path` option.
 
-See
-[action_mailer/base.rb](api.rubyonrails.org/v4.1.0/classes/ActionMailer/Base.html)
+See its
+[documentation](http://api.rubyonrails.org/v4.1.0/classes/ActionMailer/Base.html)
 for a detailed write up.
 
 ### Active Record enums
@@ -178,21 +175,30 @@ conversation.active? # => false
 conversation.status  # => "archived"
 
 Conversation.archived # => Relation for all archived Conversations
+
+Conversation.statuses # => { "active" => 0, "archived" => 1 }
 ```
 
-See
-[active_record/enum.rb](api.rubyonrails.org/v4.1.0/classes/ActiveRecord/Enum.html)
+See its
+[documentation](http://api.rubyonrails.org/v4.1.0/classes/ActiveRecord/Enum.html)
 for a detailed write up.
 
-### Application message verifier
+### Message Verifiers
 
-Create a message verifier that can be used to generate and verify signed
-messages in the application.
+Message verifiers can be used to generate and verify signed messages. This can
+be useful to safely transport sensitive data like remember-me tokens and
+friends.
+
+The method `Rails.application.message_verifier` returns a new message verifier
+that signs messages with a key derived from secret_key_base and the given
+message verifier name:
 
 ```ruby
-message = Rails.application.message_verifier('salt').generate('my sensible data')
-Rails.application.message_verifier('salt').verify(message)
-# => 'my sensible data'
+signed_token = Rails.application.message_verifier(:remember_me).generate(token)
+Rails.application.message_verifier(:remember_me).verify(signed_token) # => token
+
+Rails.application.message_verifier(:remember_me).verify(tampered_token)
+# raises ActiveSupport::MessageVerifier::InvalidSignature
 ```
 
 ### Module#concerning
@@ -222,6 +228,10 @@ This example is equivalent to defining a `EventTracking` module inline,
 extending it with `ActiveSupport::Concern`, then mixing it in to the
 `Todo` class.
 
+See its
+[documentation](http://api.rubyonrails.org/v4.1.0/classes/Module/Concerning.html)
+for a detailed write up and the intended use cases.
+
 ### CSRF protection from remote `<script>` tags
 
 Cross-site request forgery (CSRF) protection now covers GET requests with
@@ -233,6 +243,7 @@ unless they use `xhr`. Upgrade your tests to be explicit about expecting
 XmlHttpRequests. Instead of `post :create, format: :js`, switch to the explicit
 `xhr :post, :create, format: :js`.
 
+
 Railties
 --------
 
@@ -259,7 +270,7 @@ for detailed changes.
 ### Notable changes
 
 * The [Spring application
-  preloader](https://github.com/jonleighton/spring) is now installed
+  preloader](https://github.com/rails/spring) is now installed
   by default for new applications. It uses the development group of
   the Gemfile, so will not be installed in
   production. ([Pull Request](https://github.com/rails/rails/pull/12958))
@@ -270,9 +281,17 @@ for detailed changes.
 * Exposed `MiddlewareStack#unshift` to environment
   configuration. ([Pull Request](https://github.com/rails/rails/pull/12479))
 
-* Add `Application#message_verifier` method to return a message
+* Added `Application#message_verifier` method to return a message
   verifier. ([Pull Request](https://github.com/rails/rails/pull/12995))
 
+* The `test_help.rb` file which is required by the default generated test
+  helper will automatically keep your test database up-to-date with
+  `db/schema.rb` (or `db/structure.sql`). It raises an error if
+  reloading the schema does not resolve all pending migrations. Opt out
+  with `config.active_record.maintain_test_schema = false`. ([Pull
+  Request](https://github.com/rails/rails/pull/13528))
+
+
 Action Pack
 -----------
 
@@ -292,13 +311,15 @@ for detailed changes.
 
 * Removed deprecated constants from Action Controller:
 
-      ActionController::AbstractRequest  => ActionDispatch::Request
-      ActionController::Request          => ActionDispatch::Request
-      ActionController::AbstractResponse => ActionDispatch::Response
-      ActionController::Response         => ActionDispatch::Response
-      ActionController::Routing          => ActionDispatch::Routing
-      ActionController::Integration      => ActionDispatch::Integration
-      ActionController::IntegrationTest  => ActionDispatch::IntegrationTest
+  | Removed                            | Successor                       |
+  |:-----------------------------------|:--------------------------------|
+  | ActionController::AbstractRequest  | ActionDispatch::Request         |
+  | ActionController::Request          | ActionDispatch::Request         |
+  | ActionController::AbstractResponse | ActionDispatch::Response        |
+  | ActionController::Response         | ActionDispatch::Response        |
+  | ActionController::Routing          | ActionDispatch::Routing         |
+  | ActionController::Integration      | ActionDispatch::Integration     |
+  | ActionController::IntegrationTest  | ActionDispatch::IntegrationTest |
 
 ### Notable changes
 
@@ -318,6 +339,20 @@ for detailed changes.
 * Separated Action View completely from Action
   Pack. ([Pull Request](https://github.com/rails/rails/pull/11032))
 
+* Log which keys were affected by deep
+  munge. ([Pull Request](https://github.com/rails/rails/pull/13813))
+
+* New config option `config.action_dispatch.perform_deep_munge` to opt out of
+  params "deep munging" that was used to address security vulnerability
+  CVE-2013-0155. ([Pull Request](https://github.com/rails/rails/pull/13188))
+
+* New config option `config.action_dispatch.cookies_serializer` for specifying
+  a serializer for the signed and encrypted cookie jars. (Pull Requests [1](https://github.com/rails/rails/pull/13692), [2](https://github.com/rails/rails/pull/13945) / [More Details](upgrading_ruby_on_rails.html#cookies-serializer))
+
+* Added `render :plain`, `render :html` and `render :body`. ([Pull Request](https://github.com/rails/rails/pull/14062) /
+  [More Details](upgrading_ruby_on_rails.html#rendering-content-from-string))
+
+
 Action Mailer
 -------------
 
@@ -327,9 +362,13 @@ for detailed changes.
 
 ### Notable changes
 
+* Added mailer previews feature based on 37 Signals mail_view
+  gem. ([Commit](https://github.com/rails/rails/commit/d6dec7fcb6b8fddf8c170182d4fe64ecfc7b2261))
+
 * Instrument the generation of Action Mailer messages. The time it takes to
   generate a message is written to the log. ([Pull Request](https://github.com/rails/rails/pull/12556))
 
+
 Active Record
 -------------
 
@@ -356,7 +395,7 @@ for detailed changes.
 * Removed deprecated `increment_open_transactions`.
 
 * Removed deprecated `PostgreSQLAdapter#outside_transaction?`
-  methodd. You can use `#transaction_open?` instead.
+  method. You can use `#transaction_open?` instead.
 
 * Removed deprecated `ActiveRecord::Fixtures.find_table_name` in favor of
   `ActiveRecord::Fixtures.default_fixture_model_name`.
@@ -394,6 +433,8 @@ for detailed changes.
 * Remove implicit join references that were deprecated in 4.0.
 
 * Removed `activerecord-deprecated_finders` as a dependency.
+  Please see [the gem README](https://github.com/rails/activerecord-deprecated_finders#active-record-deprecated-finders)
+  for more info.
 
 * Removed usage of `implicit_readonly`. Please use `readonly` method
   explicitly to mark records as
@@ -403,16 +444,25 @@ for detailed changes.
 
 * Deprecated `quoted_locking_column` method, which isn't used anywhere.
 
-* Deprecated the delegation of Array bang methods for associations.
-  To use them, instead first call `#to_a` on the association to access the
-  array to be acted
-  on. ([Pull Request](https://github.com/rails/rails/pull/12129))
-
 * Deprecated `ConnectionAdapters::SchemaStatements#distinct`,
   as it is no longer used by internals. ([Pull Request](https://github.com/rails/rails/pull/10556))
 
+* Deprecated `rake db:test:*` tasks as the test database is now
+  automatically maintained. See railties release notes. ([Pull
+  Request](https://github.com/rails/rails/pull/13528))
+
+* Deprecate unused `ActiveRecord::Base.symbolized_base_class`
+  and `ActiveRecord::Base.symbolized_sti_name` without
+  replacement. [Commit](https://github.com/rails/rails/commit/97e7ca48c139ea5cce2fa9b4be631946252a1ebd)
+
 ### Notable changes
 
+* Default scopes are no longer overriden by chained conditions.
+
+  Before this change when you defined a `default_scope` in a model
+  it was overriden by chained conditions in the same field. Now it
+  is merged like any other scope. [More Details](upgrading_ruby_on_rails.html#changes-on-default-scopes).
+
 * Added `ActiveRecord::Base.to_param` for convenient "pretty" URLs derived from
   a model's attribute or
   method. ([Pull Request](https://github.com/rails/rails/pull/12891))
@@ -473,6 +523,36 @@ for detailed changes.
   object. Helper methods used by multiple fixtures should be defined on modules
   included in `ActiveRecord::FixtureSet.context_class`. ([Pull Request](https://github.com/rails/rails/pull/13022))
 
+* Don't create or drop the test database if RAILS_ENV is specified
+  explicitly. ([Pull Request](https://github.com/rails/rails/pull/13629))
+
+* `Relation` no longer has mutator methods like `#map!` and `#delete_if`. Convert
+  to an `Array` by calling `#to_a` before using these methods. ([Pull Request](https://github.com/rails/rails/pull/13314))
+
+* `find_in_batches`, `find_each`, `Result#each` and `Enumerable#index_by` now
+  return an `Enumerator` that can calculate its
+  size. ([Pull Request](https://github.com/rails/rails/pull/13938))
+
+* `scope`, `enum` and Associations now raise on "dangerous" name
+  conflicts. ([Pull Request](https://github.com/rails/rails/pull/13450),
+  [Pull Request](https://github.com/rails/rails/pull/13896))
+
+* `second` through `fifth` methods act like the `first`
+  finder. ([Pull Request](https://github.com/rails/rails/pull/13757))
+
+* Make `touch` fire the `after_commit` and `after_rollback`
+  callbacks. ([Pull Request](https://github.com/rails/rails/pull/12031))
+
+* Enable partial indexes for `sqlite >=
+  3.8.0`. ([Pull Request](https://github.com/rails/rails/pull/13350))
+
+* Make `change_column_null`
+  revertable. ([Commit](https://github.com/rails/rails/commit/724509a9d5322ff502aefa90dd282ba33a281a96))
+
+* Added a flag to disable schema dump after migration. This is set to `false`
+  by defualt in the production environment for new applications. ([Pull Request](https://github.com/rails/rails/pull/13948))
+
+
 Active Model
 ------------
 
@@ -490,6 +570,13 @@ for detailed changes.
 * Added new API methods `reset_changes` and `changes_applied` to
   `ActiveModel::Dirty` that control changes state.
 
+* Ability to specify multiple contexts when defining a
+  validation. ([Pull Request](https://github.com/rails/rails/pull/13754))
+
+* `attribute_changed?` now accepts a hash to check if the attribute was changed
+  `:from` and/or `:to` a given
+  value. ([Pull Request](https://github.com/rails/rails/pull/13131))
+
 
 Active Support
 --------------
@@ -516,7 +603,7 @@ for detailed changes.
 
 * Removed deprecated `Module#local_constant_names` in favor of `Module#local_constants`.
 
-* Removed deprecated `DateTime.local_offset` in favor of `DateTime.civil_from_fromat`.
+* Removed deprecated `DateTime.local_offset` in favor of `DateTime.civil_from_format`.
 
 * Removed deprecated `Logger` core extensions (`core_ext/logger.rb`).
 
@@ -540,6 +627,12 @@ for detailed changes.
 * Removed deprecated `assert_present` and `assert_blank` methods, use `assert
   object.blank?` and `assert object.present?` instead.
 
+* Remove deprecated `#filter` method for filter objects, use the corresponding
+  method instead (e.g. `#before` for a before filter).
+
+* Removed 'cow' => 'kine' irregular inflection from default
+  inflections. ([Commit](https://github.com/rails/rails/commit/c300dca9963bda78b8f358dbcb59cabcdc5e1dc9))
+
 ### Deprecations
 
 * Deprecated `Numeric#{ago,until,since,from_now}`, the user is expected to
@@ -556,11 +649,14 @@ for detailed changes.
   [More Details](upgrading_ruby_on_rails.html#changes-in-json-handling))
 
 * Deprecated `ActiveSupport.encode_big_decimal_as_string` option. This feature has
-  been extracetd into the [activesupport-json_encoder](https://github.com/rails/activesupport-json_encoder)
+  been extracted into the [activesupport-json_encoder](https://github.com/rails/activesupport-json_encoder)
   gem.
   ([Pull Request](https://github.com/rails/rails/pull/13060) /
   [More Details](upgrading_ruby_on_rails.html#changes-in-json-handling))
 
+* Deprecate custom `BigDecimal`
+  serialization. ([Pull Request](https://github.com/rails/rails/pull/13911))
+
 ### Notable changes
 
 * `ActiveSupport`'s JSON encoder has been rewritten to take advantage of the
@@ -573,9 +669,12 @@ for detailed changes.
   [More Details](upgrading_ruby_on_rails.html#changes-in-json-handling))
 
 * Added `ActiveSupport::Testing::TimeHelpers#travel` and `#travel_to`. These
-  methods change current time to the given time or time difference by stubbing
-  `Time.now` and
-  `Date.today`. ([Pull Request](https://github.com/rails/rails/pull/12824))
+  methods change current time to the given time or duration by stubbing
+  `Time.now` and `Date.today`.
+
+* Added `ActiveSupport::Testing::TimeHelpers#travel_back`. This method returns
+  the current time to the original state, by removing the stubs added by `travel`
+  and `travel_to`. ([Pull Request](https://github.com/rails/rails/pull/13884))
 
 * Added `Numeric#in_milliseconds`, like `1.hour.in_milliseconds`, so we can feed
   them to JavaScript functions like
@@ -586,11 +685,32 @@ for detailed changes.
   `at_middle_of_day` as
   aliases. ([Pull Request](https://github.com/rails/rails/pull/10879))
 
+* Added `Date#all_week/month/quarter/year` for generating date
+  ranges. ([Pull Request](https://github.com/rails/rails/pull/9685))
+
+* Added `Time.zone.yesterday` and
+  `Time.zone.tomorrow`. ([Pull Request](https://github.com/rails/rails/pull/12822))
+
 * Added `String#remove(pattern)` as a short-hand for the common pattern of
   `String#gsub(pattern,'')`. ([Commit](https://github.com/rails/rails/commit/5da23a3f921f0a4a3139495d2779ab0d3bd4cb5f))
 
-* Removed 'cow' => 'kine' irregular inflection from default
-  inflections. ([Commit](https://github.com/rails/rails/commit/c300dca9963bda78b8f358dbcb59cabcdc5e1dc9))
+* Added `Hash#compact` and `Hash#compact!` for removing items with nil value
+  from hash. ([Pull Request](https://github.com/rails/rails/pull/13632))
+
+* `blank?` and `present?` commit to return
+  singletons. ([Commit](https://github.com/rails/rails/commit/126dc47665c65cd129967cbd8a5926dddd0aa514))
+
+* Default the new `I18n.enforce_available_locales` config to `true`, meaning
+  `I18n` will make sure that all locales passed to it must be declared in the
+  `available_locales`
+  list. ([Pull Request](https://github.com/rails/rails/commit/8e21ae37ad9fef6b7393a84f9b5f2e18a831e49a))
+
+* Introduce Module#concerning: a natural, low-ceremony way to separate
+  responsibilities within a
+  class. ([Commit](https://github.com/rails/rails/commit/1eee0ca6de975b42524105a59e0521d18b38ab81))
+
+* Added `Object#present_in` to simplify value whitelisting. ([Commit](https://github.com/rails/rails/commit/4edca106daacc5a159289eae255207d160f22396))
+
 
 Credits
 -------