Merge pull request #10690 from edx/usman/fix-settings

Cleanup some settings.

cms/envs/aws.py

@@ -269,6 +269,8 @@ else:
 DATABASES = AUTH_TOKENS['DATABASES']
 
 # Enable automatic transaction management on all databases
+# https://docs.djangoproject.com/en/1.8/topics/db/transactions/#tying-transactions-to-http-requests
+# This needs to be true for all databases
 for database_name in DATABASES:
     DATABASES[database_name]['ATOMIC_REQUESTS'] = True
 

cms/envs/common.py

@@ -62,7 +62,7 @@ from xmodule.mixin import LicenseMixin
 
 
 # Dummy secret key for dev/test
-SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'
+SECRET_KEY = 'dev key'
 
 STUDIO_NAME = "Studio"
 STUDIO_SHORT_NAME = "Studio"