diff options
| -rw-r--r-- | activerecord/lib/active_record/railtie.rb | 2 | ||||
| -rw-r--r-- | guides/source/documents.yaml | 4 | ||||
| -rw-r--r-- | guides/source/performance_testing.md | 3 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/application.rb | 1 |
4 files changed, 6 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index a9f80ccd5f..41b3386c00 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -82,7 +82,7 @@ module ActiveRecord if cache.version == ActiveRecord::Migrator.current_version ActiveRecord::Model.connection.schema_cache = cache else - warn "schema_cache.dump is expired. Current version is #{ActiveRecord::Migrator.current_version}, but cache version is #{cache.version}." + warn "Ignoring db/schema_cache.dump because it has expired. The current schema version is #{ActiveRecord::Migrator.current_version}, but the one in the cache is #{cache.version}." end end end diff --git a/guides/source/documents.yaml b/guides/source/documents.yaml index 2acdcca39c..0b22423798 100644 --- a/guides/source/documents.yaml +++ b/guides/source/documents.yaml @@ -146,6 +146,10 @@ work_in_progress: true description: This guide helps in upgrading applications to latest Ruby on Rails versions. - + name: Ruby on Rails 4.0 Release Notes + url: 4_0_release_notes.html + description: Release notes for Rails 4.0. + - name: Ruby on Rails 3.2 Release Notes url: 3_2_release_notes.html description: Release notes for Rails 3.2. diff --git a/guides/source/performance_testing.md b/guides/source/performance_testing.md index 528b9c35b3..f111ce610f 100644 --- a/guides/source/performance_testing.md +++ b/guides/source/performance_testing.md @@ -658,9 +658,8 @@ Useful Links ### Rails Plugins and Gems * [Rails Analyzer](http://rails-analyzer.rubyforge.org) -* [Palmist](http://www.flyingmachinestudios.com/programming/announcing-palmist) * [Rails Footnotes](https://github.com/josevalim/rails-footnotes/tree/master) -* [Query Reviewer](https://github.com/dsboulder/query_reviewer/tree/master) +* [Query Reviewer](https://github.com/nesquena/query_reviewer) * [MiniProfiler](http://www.miniprofiler.com) ### Generic Tools diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb index f7d8f718de..39275e4285 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -47,7 +47,6 @@ module <%= app_const_base %> # config.active_record.schema_format = :sql <% unless options.skip_sprockets? -%> - # Enable the asset pipeline. config.assets.enabled = true |