Aaron Patterson d1577cfe3d Merge branch '3-2-stable' into fredwu-slow_view_loading_fix ...

* 3-2-stable:
  Merge pull request #9802 from newsline/fix-broken-action-missing
  Remove bad changelog entry from AR [ci skip]
  Wrong exception is occured when raising no translatable exception
  Don't crash exception translation w/ nil result attribute.

Conflicts:
	actionpack/CHANGELOG.md

2013-03-20 16:41:01 -07:00

..

abstract_controller

Shush uninitialized @_layout warning

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

action_controller

Merge pull request #9802 from newsline/fix-broken-action-missing

2013-03-20 18:22:31 -03:00

action_dispatch

Backport fixes about #7774 to 3-2-stable

2013-03-05 12:53:10 +01:00

action_pack

bumping to 3.2.13

2013-03-18 09:23:04 -07:00

action_view

Backport #9347 to rails 3.2

2013-03-19 09:30:50 -05: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