Merge pull request #9707 from edx/bderusha/edx-search-config

Add edx-search configuration to lms
2015-09-11 14:45:23 -04:00
parent 60e4a9f31f eec2bed0c7
commit 4234ff5959
14 changed files with 35 additions and 96 deletions
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -170,9 +170,6 @@ FEATURES = {
    # Teams feature
    'ENABLE_TEAMS': True,

-    # Teams search feature
-    'ENABLE_TEAMS_SEARCH': False,
-
    # Show video bumper in Studio
    'ENABLE_VIDEO_BUMPER': False,

--- a/cms/envs/test.py
+++ b/cms/envs/test.py
@@ -281,8 +281,5 @@ SEARCH_ENGINE = "search.tests.mock_search_engine.MockSearchEngine"
 # teams feature
 FEATURES['ENABLE_TEAMS'] = True

-# teams search
-FEATURES['ENABLE_TEAMS_SEARCH'] = True
-
 # Dummy secret key for dev/test
 SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'