Merge branch 'master' into adequaterecord

* master: (55 commits)
  [ci skip] Move association class method notes
  extract common code in `uuid_test.rb`.
  move PostgreSQL UUID tests from `datatype_test.rb` to `uuid_test.rb`.
  [ci skip] remove guide section on models in migrations
  test case for custom PostgreSQL enum type.
  Remove inclusion of rubysl gem for rbx on generated Gemfile
  let `insert_record` actuall save the object.
  [skip ci] Fix test name typo in app generator tests.
  travis s/2.1.0/2.1.1
  Bump version of bcrypt gem
  Skip test_migrate_revert_add_index_with_name if databases do not allow to create duplicate indexes on the same columns
  Optimize getting started guide images, and use png instead of jpg
  ✂️ [ci skip]
  Point master changelogs to 4-1-stable branch
  Add missing parantheses in index_exists?
  `ActionDispatch::Head` was replaced by `Rack::Head`. Closes #14191.
  [skip ci] Standardized punctuation.
  [skip ci] Fix typo in link_to :method option description
  refactor, with_locale is not needed because I18n is mocked.
  Fix ActionView label translation for more than 10 nested elements
  ...

.travis.yml

@@ -5,7 +5,7 @@ before_install:
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.1
   - rbx-2
   - jruby
 env:
@@ -35,4 +35,3 @@ notifications:
 bundler_args: --path vendor/bundle --without test
 services:
   - memcached
-

Gemfile

@@ -8,12 +8,16 @@ gemspec
 gem 'mocha', '~> 0.14', require: false
 
 gem 'rack-cache', '~> 1.2'
-gem 'bcrypt-ruby', '~> 3.1.2'
 gem 'jquery-rails', '~> 3.1.0'
 gem 'turbolinks'
 gem 'coffee-rails', '~> 4.0.0'
 gem 'arel', github: 'rails/arel'
 
+# require: false so bcrypt is loaded only when has_secure_password is used.
+# This is to avoid ActiveModel (and by extension the entire framework)
+# being dependent on a binary library.
+gem 'bcrypt', '~> 3.1.7', require: false
+
 # This needs to be with require false to avoid
 # it being automatically loaded by sprockets
 gem 'uglifier', '>= 1.3.0', require: false

RAILS_VERSION

@@ -1 +1 @@
-4.1.0.beta2
+4.2.0.alpha

RELEASING_RAILS.rdoc

@@ -203,34 +203,3 @@ There are two simple steps for fixing the CI:
 2. Fix it
 
 Repeat these steps until the CI is green.
-
-=== Manually trigger docs generation
-
-We have a post-receive hook in GitHub that calls the docs server on pushes.
-It triggers generation and publication of edge docs, updates the contrib app,
-and generates and publishes stable docs if a new stable tag is detected.
-
-The hook unfortunately is not invoked by tag pushing, so once the new stable
-tag has been pushed to origin, please run
-
-    rake publish_docs
-
-You should see something like this:
-
-    Rails master hook tasks scheduled:
-
-      * updates the local checkout
-      * updates Rails Contributors
-      * generates and publishes edge docs
-
-    If a new stable tag is detected it also
-
-      * generates and publishes stable docs
-
-    This needs typically a few minutes.
-
-Note you do not need to specify the tag, the docs server figures it out.
-
-Also, don't worry if you call that multiple times or the hook is triggered
-again by some immediate regular push, if the scripts are running new calls
-are just queued (in a queue of size 1).

Rakefile

@@ -74,7 +74,6 @@ task :update_versions do
   end
 end
 
-#
 # We have a webhook configured in GitHub that gets invoked after pushes.
 # This hook triggers the following tasks:
 #
@@ -84,11 +83,6 @@ end
 #   * if there's a new stable tag, generates and publishes stable docs
 #
 # Everything is automated and you do NOT need to run this task normally.
-#
-# We publish a new version by tagging, and pushing a tag does not trigger
-# that webhook. Stable docs would be updated by any subsequent regular
-# push, but if you want that to happen right away just run this.
-#
 desc 'Publishes docs, run this AFTER a new stable tag has been pushed'
 task :publish_docs do
   Net::HTTP.new('api.rubyonrails.org', 8080).start do |http|

actionmailer/CHANGELOG.md

@@ -1,61 +1 @@
-*   Support the use of underscored symbols when registering interceptors and
-    observers like we do elsewhere within Rails.
-
-    *Andrew White*
-
-*   Add the ability to intercept emails before previewing in a similar fashion
-    to how emails can be intercepted before delivery.
-
-    Fixes #13622.
-
-    Example:
-
-        class CSSInlineStyler
-          def self.previewing_email(message)
-            # inline CSS styles
-          end
-        end
-
-        ActionMailer::Base.register_preview_interceptor CSSInlineStyler
-
-    *Andrew White*
-
-*   Add mailer previews feature based on 37 Signals mail_view gem.
-
-    *Andrew White*
-
-*   Calling `mail()` without arguments serves as getter for the current mail
-    message and keeps previously set headers.
-
-    Fixes #13090.
-
-    Example:
-
-        class MailerWithCallback < ActionMailer::Base
-          after_action :a_callback
-
-          def welcome
-            mail subject: "subject", to: ["joe@example.com"]
-          end
-
-          def a_callback
-            mail # => returns the current mail message
-          end
-        end
-
-    *Yves Senn*
-
-*   Instrument the generation of Action Mailer messages. The time it takes to
-    generate a message is written to the log.
-
-    *Daniel Schierbeck*
-
-*   Invoke mailer defaults as procs only if they are procs, do not convert with
-    `to_proc`. That an object is convertible to a proc does not mean it's meant
-    to be always used as a proc.
-
-    Fixes #11533.
-
-    *Alex Tsukernik*
-
-Please check [4-0-stable](https://github.com/rails/rails/blob/4-0-stable/actionmailer/CHANGELOG.md) for previous changes.
+Please check [4-1-stable](https://github.com/rails/rails/blob/4-1-stable/actionmailer/CHANGELOG.md) for previous changes.

actionmailer/lib/action_mailer/base.rb

@@ -724,11 +724,11 @@ def attachments
     #     format.html
     #   end
     #
-    # You can even render text directly without using a template:
+    # You can even render plain text directly without using a template:
     #
     #   mail(to: 'mikel@test.lindsaar.net') do |format|
-    #     format.text { render text: "Hello Mikel!" }
-    #     format.html { render text: "<h1>Hello Mikel!</h1>" }
+    #     format.text { render plain: "Hello Mikel!" }
+    #     format.html { render html: "<h1>Hello Mikel!</h1>".html_safe }
     #   end
     #
     # Which will render a +multipart/alternative+ email with +text/plain+ and

actionmailer/lib/action_mailer/version.rb

@@ -1,7 +1,7 @@
 module ActionMailer
   # Returns the version of the currently loaded ActionMailer as a Gem::Version
   def self.version
-    Gem::Version.new "4.1.0.beta2"
+    Gem::Version.new "4.2.0.alpha"
   end
 
   module VERSION #:nodoc: