aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-08-25 15:07:11 -0700
committerXavier Noria <fxn@hashref.com>2011-08-25 15:07:11 -0700
commit635b9d4ca8447aeb7c90807b469b605ff1a064ff (patch)
tree3de257105e935f33df187716c549eec84613770f /railties
parent8ba491acc31bf08cf63a83ea0a3c314c52cd020f (diff)
parent3731a0f97ba37224984ec81aaf56b6b1013a85e1 (diff)
downloadrails-635b9d4ca8447aeb7c90807b469b605ff1a064ff.tar.gz
rails-635b9d4ca8447aeb7c90807b469b605ff1a064ff.tar.bz2
rails-635b9d4ca8447aeb7c90807b469b605ff1a064ff.zip
Merge pull request #2681 from guilleiguaran/doc-changes
Documentation changes: Assets Pipeline guide and Railties changelog
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG4
-rw-r--r--railties/guides/source/asset_pipeline.textile9
2 files changed, 12 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index a9b4deb551..76453f4e9a 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,9 @@
*Rails 3.2.0 (unreleased)*
+* Added destroy alias to Rails engines. [Guillermo Iguaran]
+
+* Added destroy alias for Rails command line. This allows the following: `rails d model post`. [Andrey Ognevsky]
+
* Attributes on scaffold and model generators default to string. This allows the following: "rails g scaffold Post title body:text author" [José Valim]
* Removed old plugin generator (`rails generate plugin`) in favor of `rails plugin new` command. [Guillermo Iguaran]
diff --git a/railties/guides/source/asset_pipeline.textile b/railties/guides/source/asset_pipeline.textile
index 012149c40e..4fbdda4c07 100644
--- a/railties/guides/source/asset_pipeline.textile
+++ b/railties/guides/source/asset_pipeline.textile
@@ -247,7 +247,14 @@ When the +debug_assets+ parameter is set, this line is expanded out into three s
This allows the individual parts of an asset to be rendered and debugged separately.
-NOTE. Assets debugging is turned on by default in development and test environments.
+Additionally if the +config.assets.debug+ is set to true you can debug your assets passing the +:debug+ option to the assets tags:
+
+<erb>
+<%= javascript_include_tag :application, :debug => true %>
+</erb>
+
+
+NOTE. Assets debugging is turned on by default in development and test environments. You can set +config.assets.allow_debugging+ to false to turn it off.
h3. In Production