aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2013-04-15 16:15:09 +0200
committerYves Senn <yves.senn@gmail.com>2013-04-15 21:36:40 +0200
commitdc5520fe600a91ada282228c077d62025259048d (patch)
tree96bf940002cb61496ca082a253e7ff15f366d91d /guides
parenta80f04c00e3606a85745cdf07f545175c62bd817 (diff)
downloadrails-dc5520fe600a91ada282228c077d62025259048d.tar.gz
rails-dc5520fe600a91ada282228c077d62025259048d.tar.bz2
rails-dc5520fe600a91ada282228c077d62025259048d.zip
asset guide, match application.rb snippets to the generated file [ci skip]
`if defined?(Bundler)` is no longer used in our current application.rb
Diffstat (limited to 'guides')
-rw-r--r--guides/source/asset_pipeline.md16
1 files changed, 7 insertions, 9 deletions
diff --git a/guides/source/asset_pipeline.md b/guides/source/asset_pipeline.md
index 43df544e28..4cbcfceedc 100644
--- a/guides/source/asset_pipeline.md
+++ b/guides/source/asset_pipeline.md
@@ -815,18 +815,16 @@ end
If you use the `assets` group with Bundler, please make sure that your `config/application.rb` has the following Bundler require statement:
```ruby
-if defined?(Bundler)
- # If you precompile assets before deploying to production, use this line
- Bundler.require *Rails.groups(:assets => %w(development test))
- # If you want your assets lazily compiled in production, use this line
- # Bundler.require(:default, :assets, Rails.env)
-end
+# If you precompile assets before deploying to production, use this line
+Bundler.require *Rails.groups(:assets => %w(development test))
+# If you want your assets lazily compiled in production, use this line
+# Bundler.require(:default, :assets, Rails.env)
```
-Instead of the old Rails 3.0 version:
+Instead of the generated version:
```ruby
-# If you have a Gemfile, require the gems listed there, including any gems
+# Require the gems listed in Gemfile, including any gems
# you've limited to :test, :development, or :production.
-Bundler.require(:default, Rails.env) if defined?(Bundler)
+Bundler.require(:default, Rails.env)
```