diff --git a/cms/envs/common.py b/cms/envs/common.py index 40950d5648..e27c56e381 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -62,8 +62,6 @@ from xmodule.mixin import LicenseMixin STUDIO_NAME = "Studio" STUDIO_SHORT_NAME = "Studio" FEATURES = { - 'USE_DJANGO_PIPELINE': True, - 'GITHUB_PUSH': False, # for consistency in user-experience, keep the value of the following 3 settings diff --git a/common/djangoapps/pipeline_mako/templates/static_content.html b/common/djangoapps/pipeline_mako/templates/static_content.html index 3b461fa08a..6e169f2ed3 100644 --- a/common/djangoapps/pipeline_mako/templates/static_content.html +++ b/common/djangoapps/pipeline_mako/templates/static_content.html @@ -22,7 +22,7 @@ except: group = rtl_group %> - % if settings.FEATURES['USE_DJANGO_PIPELINE']: + % if settings.PIPELINE_ENABLED: ${compressed_css(group, raw=raw)} % else: % for filename in settings.PIPELINE_CSS[group]['source_filenames']: @@ -32,7 +32,7 @@ except: <%def name='js(group)'> - % if settings.FEATURES['USE_DJANGO_PIPELINE']: + % if settings.PIPELINE_ENABLED: ${compressed_js(group)} % else: % for filename in settings.PIPELINE_JS[group]['source_filenames']: diff --git a/lms/envs/common.py b/lms/envs/common.py index 082c046693..e4c56df621 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -64,8 +64,6 @@ DISCUSSION_SETTINGS = { # Features FEATURES = { - 'USE_DJANGO_PIPELINE': True, - 'DISPLAY_DEBUG_INFO_TO_STAFF': True, 'DISPLAY_HISTOGRAMS_TO_STAFF': False, # For large courses this slows down courseware access for staff.