1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
rails--rails/actionpack/lib/action_controller
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
..
caching Remove observers and sweepers 2012-11-28 22:46:49 -02:00
metal Merge branch 'master' into laurocaetano-fix_send_file 2014-01-10 11:00:30 -08:00
railties
base.rb Require action_view explicitly in AC::Base 2013-12-08 13:03:41 +01:00
caching.rb Removed random dot in code sample [ci skip] 2013-07-22 16:13:18 +04:00
log_subscriber.rb inspect the filter when displaying error messages 2013-05-14 14:13:32 -07:00
metal.rb Increase readability of ternary statement in build method 2013-04-20 15:24:23 +01:00
middleware.rb
model_naming.rb Remove ActiveModel dependency from ActionPack 2012-06-30 11:04:31 -05:00
railtie.rb Add missing av/railtie require 2013-12-22 22:54:51 +01:00
test_case.rb Re-remove deprecated API. 2013-06-28 01:42:07 +09:00