diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-22 00:00:20 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-22 00:00:20 -0200 |
| commit | 19bd2f227929c6ad3c1ea6d675d91f2165dec40b (patch) | |
| tree | 6e7454cef2ab87e2f417ac5cdbb504a6f492f28e /railties/CHANGELOG.md | |
| parent | 1e8d5e62c6c19dde238a6e17b135993b9c0e0cd6 (diff) | |
| parent | 48d5a33269eac16e7927c8811bfdc6010a965959 (diff) | |
| download | rails-19bd2f227929c6ad3c1ea6d675d91f2165dec40b.tar.gz rails-19bd2f227929c6ad3c1ea6d675d91f2165dec40b.tar.bz2 rails-19bd2f227929c6ad3c1ea6d675d91f2165dec40b.zip | |
Merge pull request #8557 from timraymond/add_back_engines_and_deprecate
Adding Back Rails::Engine::Railties#engines
Conflicts:
railties/CHANGELOG.md
Diffstat (limited to 'railties/CHANGELOG.md')
| -rw-r--r-- | railties/CHANGELOG.md | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 5dbca2e9b4..3b0f282143 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,5 +1,11 @@ ## Rails 4.0.0 (unreleased) ## +* Restore Rails::Engine::Railties#engines with deprecation to ensure + compatibility with gems such as Thinking Sphinx + Fix #8551 + + *Tim Raymond* + * Specify which logs to clear when using the `rake log:clear` task. (e.g. rake log:clear LOGS=test,staging) |