rails/actionpack/lib/action_dispatch
Aaron Patterson 1ce0cc0d38 Merge branch 'master' of github.com:rails/rails
* 'master' of github.com:rails/rails:
  For our build, stick with mail 2.5.x for now
  Correct result, previously showing wrong result
  Collapse PG default extractoin of most types to single regex
  Change wording of explanation about precision & scale of decimal numbers [ci skip]
  Cleaned up duplicated CHANGELOG entry [ci skip]
  reuse available belongs_to? method
  Convert StrongParameters cache to a hash. This fixes an unbounded memory leak demonstrated on @tenderlove's latest blog post:
  Partially revert deprecation of *_filter
  Pluralize params
  Add default_i18n_subject to the guides
  Fix regression on eager loading association based on SQL query rather than existing column.
  Relax mail gem constraint from ~> 2.5.4 to ~> 2.5, >= 2.5.4
  Keep column defaults in type cast form
  Return a null column when no column exists for an attribute
  Refactor XML serializer to not depend on `serialized_attributes`
  Test the serialized types of virtual columns in XML
  implement ActiveRecord::Base#pretty_print + changelog
  Remove duplicated HashWithIndifferentAccess#with_indifferent_access.
2014-06-04 11:45:53 -07:00
..
http Merge pull request #15349 from tgxworld/remove_duplicated_method_call 2014-06-03 19:10:33 -03:00
journey no more is_a checks on instantiation 2014-05-29 15:45:42 -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 push splitting "to" up the callstack 2014-06-03 16:23:39 -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