diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-07-05 14:03:57 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-07-05 14:03:57 -0700 |
| commit | a7826bd8b7791284148c53eeefe35e8ab1185b31 (patch) | |
| tree | 86f55052e7b779af1730d7642db6ba61ff293201 /actionpack/lib/action_controller/caching | |
| parent | c8d6dded997b46d0e1807fe295363fc5048a33ef (diff) | |
| parent | 6d0394ca28d68317d6119f28e9e07f48e6e5f50c (diff) | |
| download | rails-a7826bd8b7791284148c53eeefe35e8ab1185b31.tar.gz rails-a7826bd8b7791284148c53eeefe35e8ab1185b31.tar.bz2 rails-a7826bd8b7791284148c53eeefe35e8ab1185b31.zip | |
Merge branch 'master' into testclean
* master:
Add documentation for inheritance_column method
Use ArgumentError vs. RuntimeError, which is more precise.
CSV fixtures aren't supported by default anymore, update generated test_helper.rb to reflect that
fix quoting for ActiveSupport::Duration instances
Add few information on the field types
Add the options method to action_controller testcase.
Diffstat (limited to 'actionpack/lib/action_controller/caching')
0 files changed, 0 insertions, 0 deletions