Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Notice/alert are out of the layout, so notice has to go back into show to make it work for scaffolding

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

This reverts commit ea2c5fa8.

Conflicts:

	railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb
	railties/test/generators/app_generator_test.rb

Expect an incompatible encoding exception when a template with a magic comment renders a partial without one and its source encoding doesn't match the default external encoding

Expect an incompatible encoding exception when a template doesn't have a magic comment and its source encoding doesn't match the default external encoding

adds #favicon_link_tag back, rdoc explains why it is useful, and how to get a link for Mobile Safari with it

Revert "When creating database with rake, create schemas in schema_search_path if it doesn't exist."

This reverts commit 6c2a0675.

Reverting because it breaks the ability to run tests using a non-superuser.

Conflicts:

	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
	activerecord/lib/active_record/railties/databases.rake

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

This reverts commit 6891f46d, ec8610cf, and  d18ff1b7.

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