diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-04-23 01:11:24 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-04-23 01:11:24 +0200 |
| commit | af1b48926f49226c934995c322ee017239158cf3 (patch) | |
| tree | a496e072226dc4c16f70b5d74cb7eb800391fa82 /railties/test | |
| parent | f7538808d466b756df15ac3f27ca08370f7a189c (diff) | |
| parent | df70b9dfb23aa05ed7ae7955ff0fb7eec68de9a3 (diff) | |
| download | rails-af1b48926f49226c934995c322ee017239158cf3.tar.gz rails-af1b48926f49226c934995c322ee017239158cf3.tar.bz2 rails-af1b48926f49226c934995c322ee017239158cf3.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Conflicts:
activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/generators/assets_generator_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/generators/assets_generator_test.rb b/railties/test/generators/assets_generator_test.rb index e99f0f092a..375632e5bc 100644 --- a/railties/test/generators/assets_generator_test.rb +++ b/railties/test/generators/assets_generator_test.rb @@ -1,7 +1,7 @@ require 'generators/generators_test_helper' require 'rails/generators/rails/assets/assets_generator' -# FOXME: Silence the 'Could not find task "using_coffee?"' message in tests due to the public stub +# FIXME: Silence the 'Could not find task "using_coffee?"' message in tests due to the public stub class AssetsGeneratorTest < Rails::Generators::TestCase include GeneratorsTestHelper arguments %w(posts) |