diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-12-18 17:02:21 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-12-18 17:02:21 -0800 |
| commit | 88e91570128170b865cfdb3e78f1fefcf791d073 (patch) | |
| tree | 161978b650f19ef1d562377df5db2086aef92766 | |
| parent | e68abc2c967d67a15fd99247bd00547d8bd3170d (diff) | |
| parent | 411e499677981ef649c000a36f5a805516096c3e (diff) | |
| download | rails-88e91570128170b865cfdb3e78f1fefcf791d073.tar.gz rails-88e91570128170b865cfdb3e78f1fefcf791d073.tar.bz2 rails-88e91570128170b865cfdb3e78f1fefcf791d073.zip | |
Merge pull request #8552 from frodsan/concerned_tests
Fix railties tests related to the addition of app/[models|controllers]/concerns, and improve changelog.
| -rw-r--r-- | railties/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index d73af824d6..2965ce9ffc 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,9 +1,10 @@ ## Rails 4.0.0 (unreleased) ## -* Add app/models/concerns and app/controllers/concerns to the default directory structure and load path *DHH* - +* Add `app/models/concerns` and `app/controllers/concerns` to the default directory structure and load path. See http://37signals.com/svn/posts/3372-put-chubby-models-on-a-diet-with-concerns for usage instructions. + *DHH* + * The `rails/info/routes` now correctly formats routing output as an html table. *Richard Schneeman* diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index b7e366d266..bd0f9d6a32 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -11,9 +11,11 @@ DEFAULT_APP_FILES = %w( app/assets/stylesheets app/assets/images app/controllers + app/controllers/concerns app/helpers app/mailers app/models + app/models/concerns app/views/layouts config/environments config/initializers |