Prevent assert_template failures when a render :inline is called before rendering a file-based template [#1383 state:resolved]
Signed-off-by: NJoshua Peek <josh@joshpeek.com>

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

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

Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Change usage of defined? to check the rubygems constant existance by a rescue block on boot.rb for Ruby 1.9 compatibility
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

BACKWARDS INCOMPATIBLE: Renamed application.rb to application_controller.rb and removed all the special casing that was in place to support the former. You must do this rename in your own application when you upgrade to this version [DHH]

Fixed RedCloth and BlueCloth shouldn't preload. Instead just assume that they're available if you want to use textilize and markdown and let autoload require them [DHH]

For more information see:

http://pseudo-flaw.net/content/web-browsers/form-data-encoding-roundup/

Revert "Added default_scope to Base [#1381 state:committed] (Paweł Kondzior)" -- won't gel with threads.

This reverts commit ff594b2b.

auto_link helper: add intelligent ending closing bracket handling. add new tests and reorder new ones for readability
Signed-off-by: NMichael Koziarski <michael@koziarski.com>
[#1353 state:committed]

Signed-off-by: NMichael Koziarski <michael@koziarski.com>

Moved the * strings out of construct_finder_sql to a new default_select method so it can be overridden by plugins cleanly
Signed-off-by: NMichael Koziarski <michael@koziarski.com>
[#1371 state:resolved]

Signed-off-by: NMichael Koziarski <michael@koziarski.com>

Added lambda merging to OptionMerger (especially useful with named_scope and with_options) [#740 state:committed] (Paweł Kondzior)

Added lambda merging to OptionMerger (especially useful with named_scope and with_options) [#740 state:commited] (Paweł Kondzior)

Fixed that no body charset would be set when there are attachments present [#740 state:commited] (Paweł Kondzior)