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.
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
Merge pull request #6842 from ernie/handle-non-strings-in-grouped-calculations

Stop assuming strings for grouped calculations
Conflicts:
	activerecord/lib/active_record/relation/calculations.rb
Ensure Arel columns are typecasted properly when grouping with calculation

Fix build issue with postgresql.

Conflicts:
	activerecord/lib/active_record/relation/calculations.rb
	activerecord/test/cases/calculations_test.rb
Merge pull request #6857 from rsutphin/as_core_ext_time_missing_require

Missing require breaks Time.=== when selectively loading ActiveSupport core_exts in 3.2.4+
Merge pull request #6900 from cbandy/issue-6898

Require URI in ConnectionSpecification
Conflicts:
	activerecord/lib/active_record/connection_adapters/connection_specification.rb
Merge pull request #6878 from masarakki/master

fix bug in limit of enum columns of mysql

Closes #6432
make sure the inflection rules are loaded when cherry-picking active_support/core_ext/string/inflections.rb [fixes #6884]
Backport #3329 to 3-2-stable

Fix bug with autosave collection association on new record with a marked
for destroy record in autosave collection.

Fixes #6918.
Merge pull request #6935 from frodsan/b1e509ad7a8c8264544f10f4666705cd806b5408

Backport #3329 to 3-2-stable
Fix NumberHelper options wrapping to prevent verbatim blocks being rendered instead of line continuations.  While I'm at it, wrap long comment lines consistently.

Conflicts:
	actionpack/lib/action_view/helpers/number_helper.rb

There was just one conflict related to the addition of the :format
option to number_to_percentage.