Conflicts:
	actionpack/lib/action_controller/abstract/callbacks.rb
	actionpack/lib/action_controller/abstract/renderer.rb
	actionpack/lib/action_controller/base/base.rb
	actionpack/lib/action_controller/dispatch/dispatcher.rb
	actionpack/lib/action_controller/routing/route_set.rb
	actionpack/lib/action_controller/testing/process.rb
	actionpack/test/abstract_controller/layouts_test.rb
	actionpack/test/controller/filters_test.rb
	actionpack/test/controller/helper_test.rb
	actionpack/test/controller/render_test.rb
	actionpack/test/new_base/test_helper.rb

This reverts commit a747ab5b.

[#2594 state:open]

This reverts commit 99c103be.

  In AbstractController, this means that response_body is not empty

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

Added db/seeds.rb as a default file for storing seed data for the database. Can be loaded with rake db:seed (or created alongside the db with db:setup). (This is also known as the "Stop Putting Gawd Damn Seed Data In Your Migrations" feature) [DHH]

Allow you to pass :all_blank to :reject_if option to automatically create a Proc that will reject any record with blank attributes.

Fixed eager load error on find with include => [:table_name] and hash conditions like {:table_name => {:column => 'value'}}
Signed-off-by: NMichael Koziarski <michael@koziarski.com>

ActiveSupport::OrderedHash#to_a method returns an ordered set of arrays. Matches ruby1.9's Hash#to_a.
Signed-off-by: NMichael Koziarski <michael@koziarski.com>
[#2629 state:committed]

Signed-off-by: NMichael Koziarski <michael@koziarski.com>

Signed-off-by: NMichael Koziarski <michael@koziarski.com>

$ ruby -Iactiveresource/lib tools/profile_requires.rb active_resource
91.84 KB       3220 obj      4.0 ms  active_resource
83.86 KB       3108 obj      3.3 ms   active_support
69.32 KB       2682 obj      2.6 ms    active_support/vendor
33.98 KB        651 obj      0.6 ms     i18n
94.40 KB        315 obj      4.0 ms  44 KB RSS

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

Signed-off-by: NJoshua Peek <josh@joshpeek.com>

You can now add an :inverse_of option to has_one, has_many and belongs_to associations.  This is best described with an example:

class Man < ActiveRecord::Base
  has_one :face, :inverse_of => :man
end

class Face < ActiveRecord::Base
  belongs_to :man, :inverse_of => :face
end

m = Man.first
f = m.face

Without :inverse_of m and f.man would be different instances of the same object (f.man being pulled from the database again).  With these new :inverse_of options m and f.man are the same in memory instance.

Currently :inverse_of supports has_one and has_many (but not the :through variants) associations.  It also supplies inverse support for belongs_to associations where the inverse is a has_one and it's not a polymorphic.
Signed-off-by: NMurray Steele <muz@h-lame.com>
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>