Conflicts:
	ci/cruise_config.rb

[#1686 state:committed]

  config.middleware.swap ActionController::Session::CookieStore, MySessionStore

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

Restore cookie store httponly default to true. Remove extraneous dup of options on initialization [#1784 state:resolved]
Signed-off-by: NJoshua Peek <josh@joshpeek.com>

To continue using script/performance/profiler, install the request_profiler plugin :

  script/plugin install git://github.com/rails/request_profiler.git

Add ActionMailer::Base#enable_starttls_auto option for enabling/disabling STARTTLS. [#1731 state:resolved]
Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

Build query string and POST params parser on top of Rack::Request. Also switch our multipart parser to use Racks. Moved XML, JSON, and YAML parsers into ActionController::ParamsParser middleware [#1661 state:resolved]

Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

Decouple the local cache strategy from MemCacheStore for reuse with other remote stores [#1653 state:resolved]
Signed-off-by: NJoshua Peek <josh@joshpeek.com>

This avoids repeatedly calling SHOW COLUMNS when the association is queried
[#1738 state:committed]

Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

Signed-off-by: NFrederick Cheung <frederick.cheung@gmail.com>

Signed-off-by: NFrederick Cheung <frederick.cheung@gmail.com>

Signed-off-by: NFrederick Cheung <frederick.cheung@gmail.com>

Make belongs_to :dependent => :destroy  destroy self before associated object [#1079 state:resolved]

If foreign key constraints are in place then deleteing the associated object first will cause a foreign key violation
Signed-off-by: NFrederick Cheung <frederick.cheung@gmail.com>

According to the RFC and the json.org site all json keys must be strings, and those strings must be quoted with double quotes.
[#1755 state:committed]

Added in a local per request cache to MemCacheStore. It acts as a buffer to stop unneccessary requests being sent through to memcache [#1653 state:resolved]
Signed-off-by: NJoshua Peek <josh@joshpeek.com>

Fixed broken after_save callback; was being called when before_create was canceled or before_update was canceled
Signed-off-by: NMichael Koziarski <michael@koziarski.com>
[#1735 state:committed]

Fixing bug on ActiveRecord::Dirty#field_changed? for nullable numeric columns, NULL gets stored in database for blank (i.e. '') values. Only integer columns were considered.
Signed-off-by: NMichael Koziarski <michael@koziarski.com>
[#1692 state:committed]

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