diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-17 03:20:30 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-17 03:20:30 +0530 |
| commit | b04230e3bbf912d60601e9e7b797c4cd43581d51 (patch) | |
| tree | 97a2f784a2ec2bfae4f960af56a9280dad6f7774 /actionpack/test/lib | |
| parent | 867829b187969607aa12f2b0457f25da9c204db0 (diff) | |
| parent | 6e3bee6cf1f0d2684152292db0a8b757249824fd (diff) | |
| download | rails-b04230e3bbf912d60601e9e7b797c4cd43581d51.tar.gz rails-b04230e3bbf912d60601e9e7b797c4cd43581d51.tar.bz2 rails-b04230e3bbf912d60601e9e7b797c4cd43581d51.zip | |
Merge remote branch 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/metal/flash.rb
Diffstat (limited to 'actionpack/test/lib')
| -rw-r--r-- | actionpack/test/lib/controller/fake_models.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/lib/controller/fake_models.rb b/actionpack/test/lib/controller/fake_models.rb index b0e5d7a94c..7346cb22bc 100644 --- a/actionpack/test/lib/controller/fake_models.rb +++ b/actionpack/test/lib/controller/fake_models.rb @@ -69,7 +69,7 @@ class Post < Struct.new(:title, :author_name, :body, :secret, :written_on, :cost attr_accessor :author def author_attributes=(attributes); end - attr_accessor :comments + attr_accessor :comments, :comment_ids def comments_attributes=(attributes); end attr_accessor :tags |