diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2010-12-12 09:55:32 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2010-12-12 09:55:32 +0000 |
| commit | 9a98c766e045aebc2ef6d5b716936b73407f095d (patch) | |
| tree | 899834482c828f31a89ebc7bb6e19cbe0b5f18d3 /actionpack/test/lib/controller/fake_models.rb | |
| parent | 3a7f43ca6ecf1735e1a82d4a68ac8f62b5cf2fcf (diff) | |
| parent | 307443972c5f6de959a5401eec76ca327484b10c (diff) | |
| download | rails-9a98c766e045aebc2ef6d5b716936b73407f095d.tar.gz rails-9a98c766e045aebc2ef6d5b716936b73407f095d.tar.bz2 rails-9a98c766e045aebc2ef6d5b716936b73407f095d.zip | |
Merge branch 'master' into nested_has_many_through
Conflicts:
activerecord/CHANGELOG
activerecord/lib/active_record/associations/class_methods/join_dependency.rb
activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
activerecord/lib/active_record/associations/has_many_through_association.rb
Diffstat (limited to 'actionpack/test/lib/controller/fake_models.rb')
| -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 bd18cdc1b8..67baf369e2 100644 --- a/actionpack/test/lib/controller/fake_models.rb +++ b/actionpack/test/lib/controller/fake_models.rb @@ -197,6 +197,6 @@ end class RenderJsonTestException < Exception def to_json(options = nil) - return { :error => self.class.name, :message => self.to_str }.to_json + return { :error => self.class.name, :message => self.to_s }.to_json end end |