aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-23 13:42:05 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-23 13:42:05 -0700
commit432ffdb0739426122e216e0f7199ebc16f15de7e (patch)
treef6f11dd0f25680eca897b4df1a48a75d57e84353 /guides
parent030d30d64cd8d8e376f9db25a3fe3e11358731cf (diff)
parentdc5520fe600a91ada282228c077d62025259048d (diff)
downloadrails-432ffdb0739426122e216e0f7199ebc16f15de7e.tar.gz
rails-432ffdb0739426122e216e0f7199ebc16f15de7e.tar.bz2
rails-432ffdb0739426122e216e0f7199ebc16f15de7e.zip
Merge pull request #10222 from senny/update_bundler_section_in_assets_guide
docs, adjust the application.rb snippets to match the generated file. Closes #10449
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 b86c7bfc4e..3b3707d9e5 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)
```