Martín Miranda

Merge branch 'feature/#17_eliminar_requests_de_las_app' into 'develop'

Closed feature/#17_eliminar_requests



See merge request !11
@@ -28,6 +28,7 @@ DEBUG = env.bool('DJANGO_DEBUG', False) @@ -28,6 +28,7 @@ DEBUG = env.bool('DJANGO_DEBUG', False)
28 28
29 SECRET_KEY = env('DJANGO_SECRET_KEY', default='CHANGEME!!!') # noqa 29 SECRET_KEY = env('DJANGO_SECRET_KEY', default='CHANGEME!!!') # noqa
30 ALLOWED_HOSTS = env.list('DJANGO_ALLOWED_HOSTS', default='*') # noqa 30 ALLOWED_HOSTS = env.list('DJANGO_ALLOWED_HOSTS', default='*') # noqa
  31 +CSRF_TRUSTED_ORIGINS = env.list('DJANGO_CSRF_TRUSTED_ORIGINS', default=[])
31 32
32 FORCE_SCRIPT_NAME = env.str('DJANGO_FORCE_SCRIPT_NAME', default=None) 33 FORCE_SCRIPT_NAME = env.str('DJANGO_FORCE_SCRIPT_NAME', default=None)
33 USE_X_FORWARDED_HOST = env.bool('DJANGO_USE_X_FORWARDED_HOST', default=False) 34 USE_X_FORWARDED_HOST = env.bool('DJANGO_USE_X_FORWARDED_HOST', default=False)
@@ -50,7 +51,6 @@ THIRD_PARTY_APPS = ( @@ -50,7 +51,6 @@ THIRD_PARTY_APPS = (
50 'django_filters', 51 'django_filters',
51 'corsheaders', 52 'corsheaders',
52 'oauth2_provider', 53 'oauth2_provider',
53 - 'requests',  
54 ) 54 )
55 55
56 PROJECT_APPS = ( 56 PROJECT_APPS = (
@@ -173,6 +173,5 @@ AUTHENTICATION_BACKENDS = ( @@ -173,6 +173,5 @@ AUTHENTICATION_BACKENDS = (
173 'django.contrib.auth.backends.ModelBackend', 173 'django.contrib.auth.backends.ModelBackend',
174 ) 174 )
175 175
176 -CSRF_TRUSTED_ORIGINS = env.list('DJANGO_CSRF_TRUSTED_ORIGINS', default=[])  
177 # Secret Key para Captcha. 176 # Secret Key para Captcha.
178 -SECRET_KEY_CAPTCHA = env.str("SECRET_KEY_CAPTCHA", default="") 177 +SECRET_KEY_CAPTCHA = env.str('SECRET_KEY_CAPTCHA', default="")