Merge pull request #9681 from edx/release

Release 2015-09-09
2015-09-09 12:38:15 -04:00
parent f5057b841c 020e16495d
commit b5d6b210fd
16 changed files with 86 additions and 25 deletions
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -170,6 +170,9 @@ 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,5 +281,8 @@ 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'