Signed-off-by: NJosé Valim <jose.valim@gmail.com>

[#3671 state:committed]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Rollback the transaction when one of the autosave associations fails to save. [#3391 state:resolved]

Signed-off-by: NEloy Duran <eloy.de.enige@gmail.com>

Mailer should give self as payload because it contains all the information needed (as the template rendered and the mailer name).

  validates :email, :presence => true, :format => /@/
  validates :genre, :inclusion => %w(m f)
  validates :password, :length => 6..20

Compile length validator options still at the class level, so whenever the validator is called, it just needs to check for :maximum, :minimum and :is values.

Fixed that fragment caching should return a cache hit as html_safe (or it would all just get escaped) [DHH]

Conflicts:
	actionmailer/actionmailer.gemspec
	actionmailer/lib/action_mailer/vendor/text-format-0.6.3/text/format.rb

Restore the connection method which was added so it can be overridden.

This reverts commit e428c75d.

class Person < ActiveRecord::Base
  include MyValidators

  validates :name, :presence => true, :uniqueness => true, :length => { :maximum => 100 }
  validates :email, :presence => true, :email => true
end

[#3058 status:resolved]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

This allows the following setup to work:

  # app/controllers/application_controller.rb
  class ApplicationController
    def default_url_options(options=nil)
      { :locale => I18n.locale }
    end
  end

  # From your views and controllers:
  I18n.locale                 #=> :en
  users_url                   #=> "/en/users"
  users_url(:pl)              #=> "/pl/users"
  user_url(1)                 #=> "/en/users/1"
  user_url(:pl, 1)            #=> "/pl/users/1"
  user_url(1, :locale => :pl) #=> "/pl/users/1"

If you provide all expected parameters, it still works as previously.
But if any parameter is missing, it tries to assign all possible ones
with the hash returned in default_url_options or the one passed straight
to the named route method.

Beware that default_url_options in ApplicationController is not shared
with ActionMailer, so you are required to always give the locale in your
email views.

Remove duplicated url_for code and move methods shared between ActionMailer and ActionController up to AbstractController.

For example, you could easily specify :created_at and :updated_at translations as:

  en:
    attributes:
      created_at: "Created at"
      updated_at: "Updated at"

This configuration is built on ActiveModel, so it means those translations are
shared between different ORMs as well (but always as a fallback).