Aaron Patterson caa981d881 Merge branch 'master' into laurocaetano-fix_send_file ... * master: (536 commits) doc, API example on how to use `Model#exists?` with multiple IDs. [ci skip] Restore DATABASE_URL even if it's nil in connection_handler test [ci skip] - error_messages_for has been deprecated since 2.3.8 - lets reduce any confusion for users Ensure Active Record connection consistency Revert "ask the fixture set for the sql statements" Check `respond_to` before delegation due to: d781caaf31 Adding Hash#compact and Hash#compact! methods MySQL version 4.1 was EOL on December 31, 2009 We should at least recommend modern versions of MySQL to users. clear cache on body close so that cache remains during rendering add a more restricted codepath for templates fixes #13390 refactor generator tests to use block form of Tempfile Fix typo [ci skip] Move finish_template as the last public method in the generator Minor typos fix [ci skip] make `change_column_null` reversible. Closes #13576. create/drop test and development databases only if RAILS_ENV is nil Revert "Speedup String#to" typo fix in test name. [ci skip]. `core_ext/string/access.rb` test what we are documenting. Fix typo in image_tag documentation ... Conflicts: actionpack/CHANGELOG.md		2014-01-10 11:00:30 -08:00
..
abstract_controller	Move the null mime type to request.format	2013-12-23 16:16:49 -02:00
action_controller	Merge branch 'master' into laurocaetano-fix_send_file	2014-01-10 11:00:30 -08:00
action_dispatch	Allow an absolute controller path inside a module scope	2014-01-05 19:58:04 +00:00
action_pack	Get ready to release 4.1.0.beta1	2013-12-17 16:05:28 -08:00
abstract_controller.rb	No need for .rb extension	2013-08-25 11:39:09 +02:00
action_controller.rb	Remove deprecated cattr_* requires	2013-12-03 00:28:15 +02:00
action_dispatch.rb	update copyright notices to 2014. [ci skip]	2014-01-01 23:59:49 +05:30
action_pack.rb	update copyright notices to 2014. [ci skip]	2014-01-01 23:59:49 +05:30