pass the :expires_in option to Rails::Cache#write properly

convert expires_at option on authenticated_s3_url to integer to prevent amazon errors

Fix resizing of images with a height much bigger than with (or reverse). Minimum size is 1 pixel

Fix gif thumbnails for ImageScience when attachment_options[:processor] is set searching for a installed processor.

Merge branch 'master' of git://github.com/aka47/attachment_fu into mm

add image/x-citrix-pjpeg mime type

* added workaround for better gif handling

added new crop method to mini_magick processor, works by using "c" at the end of the size string for any thumbnail => "75x75c".

Quick fix for creating thumbnails

remove temp_path= and temp_data= methods so they cant be assigned with multiple attributes

Merge branch 'master' of git://github.com/dasil003/attachment_fu

Merge branch 'master' of git@github.com:squarelover/attachment_fu

Adding various MIME types that some browsers or applications provide for tstandard image types.

Allow for a trailing x on width-only geometry strings per spec

Add :reconnect option to generated mysql database.yml [#1838 state:resolved]

Use Rack::Head middleware to ensure the body is discarded for HEAD requests

Remove ancient tests for CGI parsing bug

Removed Prototype specific Safari 2 AJAX hack.

Don't rely on the order in these tests

validate_length_of should use custom message if given when using in or within.

Removed map.resources :only/:except inheritance

Add support for nested object forms to ActiveRecord and the helpers in ActionPack

Ruby 1.9 compat: omit Rack::Lint from integration tests until it accepts String headers and bodies

Fix unsorted array comparison

Ruby 1.9 compat: work around that String is not Enumerable

Make sure XmlMini is being correctly autoloaded by Ruby 1.9.1

Ensure constant_watch_stack is protected by a mutex, so concurrent requires do not corrupt it.

Controller, response, and request should all refer to same session, even after a call to session_reset [#1823 state:resolved]

Deprecation tests for f17c876 [#1801 state:resolved]

Digest#validate_digest_response should accept request instead of controller

Added grouped_options_for_select helper method for wrapping option tags in optgroups. [#977 state:resolved]

Implement HTTP Digest authentication. [#1230 state:resolved] [Gregg Kellogg, Pratik Naik]

Sqlite adapter's copy_table incorrectly attempts to recreate a primary key id (:id => true in the create_table) if an :id column is present, even if it isn't a primary_key.

Move to use pg instead of postgres on the CI server

Only dup local cache values if duplicable [#1653 state:resolved]

Move basic auth test controller inside the test class

Improve exception handling when Location header is invalid. [#1192 state:resolved]

Using the highlight helper on text with html shouldn't highlight text inside html attributes. [#1302 state:resolved]

Ensure whitespaces are stripped when merging string joins. [#1297 state:resolved]

Added options to script/dbconsole to sqlite3 console in various different modes. [#607 state:resolved]

ActiveResource#eqls? and == should not take into account object identity and prefix options should be considered. [#1098 state:resolved]

Ensure selected option is not ignored for collection_select. [#1037 state:resolved]

Ensure that when UrlWriter is included in multiple classes, the default_url_options of one don't affect the other. [#1277 state:resolved]

Add array id support to Model.update_counters. [#1254 state:resolved] [Carlos Júnior]

Session cookie header should always be set if :expire_after option is specified

Use toplevel reference to ::StringIO since we're in a BasicObject.

Merge branch 'master' of git@github.com:rails/rails

Fix for sweepers method_missing missing &block argument [#1581 status:committed]

Disable eager loading for all rake tasks [#802 state:resolved]

Restore implicit rendering for XHR requests that want a HTML template [#1590 state:resolved]

Fixed deprecated methods on TestSession [#1801 state:resolved]

Dont use Memoizable for ActionController::Request

Improve i18n support for number_to_human_size helper:

Ensure the full path is used when searching for layouts [#1803 state:resolved]