Aaron Patterson befeeb2d0a Merge branch '3-2-stable' into 3-2-sec ...

* 3-2-stable:
  make sure both headers are set before checking for ip spoofing
  Move set_inverse_instance to association.build_record

2013-10-03 10:27:58 -07:00

..

abstract_controller

Shush uninitialized @_layout warning

2012-09-28 10:53:17 -07:00

action_controller

Remove the use of String#% when formatting durations in log messages

2013-09-30 14:42:11 -07:00

action_dispatch

make sure both headers are set before checking for ip spoofing

2013-10-01 01:26:07 -07:00

action_pack

Preparing for 3.2.14 release

2013-07-22 12:05:41 -03:00

action_view

fix issue #11605

2013-08-24 15:24:36 -03:00

sprockets

Fixed assets loading performance in 3.2.13

2013-03-20 16:13:30 +11:00

abstract_controller.rb

Refactor ActionMailer to not use hide_actions

2010-09-03 22:59:11 +02:00

action_controller.rb

Revert the serializers API as other alternatives are now also under discussion

2011-11-25 19:29:39 +00:00

action_dispatch.rb

Extract the rendering of public exceptions pages into a Rack app.

2011-12-16 10:45:59 +01:00

action_pack.rb

We're in 2011, let's update our license

2011-02-22 18:24:20 -02:00

action_view.rb

Fixes for using action view template in isolation.

2011-11-30 09:53:09 +01:00