diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-02-23 05:30:33 -0800 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-02-23 05:30:33 -0800 |
| commit | 68a977e49757c404cea14ee1c92cb5893f458eaf (patch) | |
| tree | 32549386c5d3f9e1051677f9e8a5224ec17aac0c | |
| parent | c04a08470f787ff501440827a6c7b11d6bc34832 (diff) | |
| parent | fb9a919ce38a4081b0f55c172a1df4ff9479ca90 (diff) | |
| download | rails-68a977e49757c404cea14ee1c92cb5893f458eaf.tar.gz rails-68a977e49757c404cea14ee1c92cb5893f458eaf.tar.bz2 rails-68a977e49757c404cea14ee1c92cb5893f458eaf.zip | |
Merge pull request #5140 from fbuenemann/fix/autoflush-wrong-template
Move config.autoflush_log to correct template
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt | 3 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt index 5fa6efbec0..eb4dfa7c89 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt @@ -35,7 +35,4 @@ # Expands the lines which load the assets. config.assets.debug = true <%- end -%> - - # Disable automatic flushing of the log to improve performance. - #config.autoflush_log = false end diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt index e9a86d175e..7041550fd0 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt @@ -70,4 +70,7 @@ # with SQLite, MySQL, and PostgreSQL). # config.active_record.auto_explain_threshold_in_seconds = 0.5 <%- end -%> + + # Disable automatic flushing of the log to improve performance. + # config.autoflush_log = false end |