Merge pull request #9803 from edx/usman/use-included-staticfiles-app

Upgrade django-pipeline and staticfiles
This commit is contained in:
Brian Beggs
2015-09-23 15:50:39 -04:00
31 changed files with 70 additions and 72 deletions

View File

@@ -92,7 +92,6 @@ STATICFILES_DIRS += [
# http://stackoverflow.com/questions/12816941/unit-testing-with-django-pipeline
STATICFILES_STORAGE = 'pipeline.storage.NonPackagingPipelineStorage'
STATIC_URL = "/static/"
PIPELINE_ENABLED = False
# Update module store settings per defaults for tests
update_module_store_settings(