rails/actionpack/lib/action_dispatch
Aaron Patterson 295e912211 Merge branch 'master' into mapper
* master:
  Update url to rake docs [ci skip]
  Name#model_name doesn't return a String object
  Result sets never override a model's column type
  [ci skip] Make last note show up in postgresql guide.
  Add missing `:param` option from the docs for Mapper#match [ci skip] Option discovered by @zackperdue in #14741, implemented in #5581.
  Add @senny's changed from #14741, including code font for `resources` options, and wrapped to 80 chars. [ci skip]
  Use github url for homepage of log4r [ci skip]
  Remove TODO.
  Ensure we always use instances of the adapter specific column class
  Fix indentation from 1b4b26f [ci skip]
  [ci skip] Improve form_helpers.md guide.
  Clear inflections after test.
  Remove unnecessary include for integration tests.
  Added documentation for the :param option for resourceful routing
2014-05-29 10:56:33 -07:00
..
http rm dead code 2014-05-27 14:52:59 -07:00
journey Merge branch 'constraints' 2014-05-27 14:40:55 -07:00
middleware Escape user input before showing in the page. 2014-05-26 15:58:51 -03:00
request Log which keys were set to nil in deep_munge 2014-01-28 20:29:38 +01:00
routing Merge branch 'master' into mapper 2014-05-29 10:56:33 -07:00
testing Merge pull request #15061 from tgxworld/remove_unnecessary_include 2014-05-29 21:33:12 +09:30
journey.rb Integrate Journey into Action Dispatch 2012-12-19 22:13:08 +00:00
railtie.rb Add configuration option to optionally disable deep_munge 2013-12-05 12:08:34 +01:00
routing.rb Add missing requires for require 'action_dispatch/routing' 2014-05-15 06:03:23 +01:00