Extend ActiveRecord::Base#cache_key to take an optional list of timestamp attributes of which the highest will be used.

Added Numeric#in_milliseconds, like 1.hour.in_milliseconds, so we can feed them to JavaScript functions like getTime().

This reverts commit c2b5a8e6, reversing
changes made to 1918b12c.

See: https://github.com/rails/rails/pull/9660#issuecomment-27627493

Added ActiveRecord::Base#enum for declaring enum attributes where the values map to integers in the database, but can be queried by name

Minor doc fix of ActiveModel::Naming. [ci skip]

Conflicts:
	activemodel/lib/active_model/naming.rb

Change ActionController::Parameters#require behavior when value is empty

was using nullify strategy

This caused a regression in applications trying to upgrade.

Also if the user set the dependent option as destroy he expects to get
the records removed from the database.

Remove warnings on ruby trunk

Fix railties build

Fix typo in method description in Responder class

More Warnings removed for ruby trunk

Fixes a typo in the description for the call class method in Responder.

Since we are not using the File.exists? alias which raises a warning on
current ruby trunk, few stubs are wrong.

Since the plugin generator is relying on the application one, we need to
define the proper root when creating the plugin. The AppBase class is
not setting the destination_root (this is done via the AppGenerator)

Same as 4d4ff531

Can't used named argument in ruby 1.9.3

Fixing build

Added rubysl-rexml to Rubinius deps.

rails/generators should not load rails/generators/base since the
latter is loading it.

Warnings removed for ruby trunk

Same as 4d4ff531

Add Rdoc document for Array#forty_two [ci skip]

Updated Rubinius on Travis to 2.1.1