diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-03-12 15:31:24 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-03-12 15:31:24 +0000 |
| commit | 53744c543880999a7ad3f1e026875df3283978f1 (patch) | |
| tree | 8d01e0c15a384a46db176ad8d5cdd0bd6c9024a8 /activeresource | |
| parent | 053afbe3bd26d627ee04a0aaa73554b7be422f05 (diff) | |
| parent | 47bdf3bf40ec17e1f8ca1c0e3d7f697d0c4cd1bf (diff) | |
| download | rails-53744c543880999a7ad3f1e026875df3283978f1.tar.gz rails-53744c543880999a7ad3f1e026875df3283978f1.tar.bz2 rails-53744c543880999a7ad3f1e026875df3283978f1.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_view/helpers/text_helper.rb
activesupport/lib/active_support/inflector.rb
Diffstat (limited to 'activeresource')
| -rw-r--r-- | activeresource/test/base_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activeresource/test/base_test.rb b/activeresource/test/base_test.rb index 69bb324813..6ed6f1a406 100644 --- a/activeresource/test/base_test.rb +++ b/activeresource/test/base_test.rb @@ -47,7 +47,7 @@ class BaseTest < Test::Unit::TestCase {:name => 'Milena', :children => []}]}]}.to_xml(:root => 'customer') # - resource with yaml array of strings; for ActiveRecords using serialize :bar, Array - @marty = <<-eof + @marty = <<-eof.strip <?xml version=\"1.0\" encoding=\"UTF-8\"?> <person> <id type=\"integer\">5</id> |