Conflicts:

	actionpack/lib/action_controller/base.rb
	actionpack/lib/action_dispatch/http/mime_type.rb
	actionpack/lib/action_dispatch/http/request.rb
	actionpack/lib/action_view/base.rb
	actionpack/lib/action_view/paths.rb
	actionpack/test/controller/session/cookie_store_test.rb
	actionpack/test/dispatch/rack_test.rb
	actionpack/test/dispatch/request_test.rb

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

Controller, response, and request should all refer to same session, even after a call to session_reset [#1823 state:resolved]
Signed-off-by: NJoshua Peek <josh@joshpeek.com>

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

Added grouped_options_for_select helper method for wrapping option tags in optgroups. [#977 state:resolved]
Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

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

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.

This fix sets :id => false if there is an :id column, but it's not the primary_key.
Signed-off-by: NMichael Koziarski <michael@koziarski.com>
[#1766 state:committed]

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

Using the highlight helper on text with html shouldn't highlight text inside html attributes. [#1302 state:resolved]
Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

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

Added options to script/dbconsole to sqlite3 console in various different modes. [#607 state:resolved]
Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

ActiveResource#eqls? and == should not take into account object identity and prefix options should be considered. [#1098 state:resolved]
Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

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

Ensure that when UrlWriter is included in multiple classes, the default_url_options of one don't affect the other. [#1277 state:resolved]
Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

Signed-off-by: NDavid Heinemeier Hansson <david@loudthinking.com>