Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Upgrade django-pipeline and staticfiles
This commit is contained in:
Brian Beggs
2015-09-23 15:50:39 -04:00
parent 0b64f2d612 158bdf4d09
commit 4c05fa4f49
31 changed files with 70 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cms/envs/common.py
View File

@@ -456,14 +456,16 @@ EMBARGO_SITE_REDIRECT_URL = None
############################### PIPELINE #######################################
PIPELINE_ENABLED = True
# Process static files using RequireJS Optimizer
STATICFILES_STORAGE = 'openedx.core.lib.django_require.staticstorage.OptimizedCachedRequireJsStorage'
# List of finder classes that know how to find static files in various locations.
# Note: the pipeline finder is included to be able to discover optimized files
STATICFILES_FINDERS = [
'staticfiles.finders.FileSystemFinder',
'staticfiles.finders.AppDirectoriesFinder',
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
'pipeline.finders.PipelineFinder',
]
@@ -738,7 +740,7 @@ INSTALLED_APPS = (
# For asset pipelining
'edxmako',
'pipeline',
'staticfiles',
'django.contrib.staticfiles',
'static_replace',
'require',