diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/support/class_inheritable_attributes.rb | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 05569a2c06..a8fa53a143 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Added display of error messages with scaffolded form pages + * Added option to ERB templates to swallow newlines by using <% if something -%> instead of just <% if something %>. Example: class SomeController < AbstractApplicationController diff --git a/actionpack/lib/action_controller/support/class_inheritable_attributes.rb b/actionpack/lib/action_controller/support/class_inheritable_attributes.rb index 7f061fdf1b..39312e8d5b 100644 --- a/actionpack/lib/action_controller/support/class_inheritable_attributes.rb +++ b/actionpack/lib/action_controller/support/class_inheritable_attributes.rb @@ -28,6 +28,10 @@ module ClassInheritableAttributes # :nodoc: inheritable_attributes[key] end + def reset_inheritable_attributes + inheritable_attributes.clear + end + private def inherited(child) @@classes[child] = inheritable_attributes.dup |