ActionController::Caching depends on RackDelegation and AbstractController::Callbacks
adding a test for #6459
Deprecate update_attribute.

Historically, update_attribute and update_attributes are similar, but
with one big difference: update_attribute does not run validations.
These two methods are really easy to confuse given their similar
names. Therefore, update_attribute is being deprecated in favor of
update_column, and will be removed in Rails 4.

See the discussion on rails-core here:
https://groups.google.com/d/topic/rubyonrails-core/BWPUTK7WvYA/discussion
Merge pull request #6739 from steveklabnik/3-2-stable

Deprecate update_attribute
registers the deprecation of update_attribute in the CHANGELOG
Remove unneded tests.

Before b081f6b59fb3f15d12043072ad9b331ffd2bc56e, this test are
asserting that update_attribute does the dirty tracking. Since we
deprecated this method and update_column write in the database directly
this tests will always fail.
ActionController::Metal doesn't have logger method, check it and then delegate
Added test for case when view doesn't have logger method when using ActionController::Metal controller.
Merge pull request #6752 from steveklabnik/fix_5680

Respect absolute paths in compute_source_path.
It should also include text/css => Build Fix
Merge pull request #6756 from arunagw/build_fix_ap

Build fix actionpack
bump AS deprecation_horizon to 4.0
Merge pull request #6764 from frodsan/patch-4

bump AS deprecation_horizon to 4.0
Use strict_args_position! if available from Thor
Deprecating composed_of in ActiveRecord

This feature adds a lot of complication to ActiveRecord for dubious
value. Let's talk about what it does currently:

class Customer < ActiveRecord::Base
  composed_of :balance, :class_name => "Money", :mapping => %w(balance
amount)
end

Instead, you can do something like this:

    def balance
      @balance ||= Money.new(value, currency)
    end

    def balance=(balance)
      self[:value] = balance.value
      self[:currency] = balance.currency
      @balance = balance
    end

Since that's fairly easy code to write, and doesn't need anything
extra from the framework, if you use composed_of today, you'll
have to add accessors/mutators like that.

This feature will be removed in Rails 4.
Merge pull request #6742 from steveklabnik/deprecate_composed_of

Deprecate composed of
Merge pull request #6649 from route/logger_in_metal_3_2

Logger in metal backport for 3.2
Merge pull request #6758 from caironoleto/master

Fixing load config in some tasks
Conflicts:
	activerecord/lib/active_record/railties/databases.rake
Merge branch 'acapilleri-update_nested_attributes'

Closes #6675

Conflicts:
	activerecord/lib/active_record/attribute_methods/dirty.rb
Remove waning of unused variable