Permalink
Browse files

Merge pull request #10 from djrodgerspryor/patch-1

Merge FORCE_BUNDLES settings flag in media_bundler/conf/default_settings.py
  • Loading branch information...
2 parents 2e6c58b + 6e97007 commit cf2145a9762fc12d11c6f0cbf9156568ce8accbf @rnk committed Jan 13, 2013
Showing with 3 additions and 2 deletions.
  1. +3 −2 media_bundler/conf/default_settings.py
@@ -11,8 +11,9 @@
# This flag determines whether to enable bundling or not. To assist in
# debugging, we recommend keeping files separate during development and bundle
# them during production, so by default we just use settings.DEBUG, but you can
-# override that value if you wish.
-USE_BUNDLES = not settings.DEBUG
+# override that value if you wish by setting FORCE_BUNDLES to True in your
+# settings file.
+USE_BUNDLES = getattr(settings, 'FORCE_BUNDLES', False) or not settings.DEBUG
# This puts your JavaScript at the bottom of your templates instead of the top
# in order to allow the page to load before script execution, as described in

0 comments on commit cf2145a

Please sign in to comment.