From f4b1dcb167be0bbdaae2cc2a92f651536896dc16 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 24 Sep 2014 14:09:49 +0100
Subject: OPTIONS support

---
 rest_framework/settings.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'rest_framework/settings.py')

diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index 421e146c..d7fb0a43 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -45,6 +45,7 @@ DEFAULTS = {
     ),
     'DEFAULT_THROTTLE_CLASSES': (),
     'DEFAULT_CONTENT_NEGOTIATION_CLASS': 'rest_framework.negotiation.DefaultContentNegotiation',
+    'DEFAULT_METADATA_CLASS': 'rest_framework.metadata.SimpleMetadata',
 
     # Genric view behavior
     'DEFAULT_MODEL_SERIALIZER_CLASS': 'rest_framework.serializers.ModelSerializer',
@@ -121,6 +122,7 @@ IMPORT_STRINGS = (
     'DEFAULT_PERMISSION_CLASSES',
     'DEFAULT_THROTTLE_CLASSES',
     'DEFAULT_CONTENT_NEGOTIATION_CLASS',
+    'DEFAULT_METADATA_CLASS',
     'DEFAULT_MODEL_SERIALIZER_CLASS',
     'DEFAULT_PAGINATION_SERIALIZER_CLASS',
     'DEFAULT_FILTER_BACKENDS',
-- 
cgit v1.2.3


From dee3f78cb688b1bee892ef78d6eec23ccf67a80e Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 26 Sep 2014 17:06:20 +0100
Subject: FileField and ImageField

---
 rest_framework/settings.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'rest_framework/settings.py')

diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index d7fb0a43..1e8c27fc 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -110,7 +110,8 @@ DEFAULTS = {
     # Encoding
     'UNICODE_JSON': True,
     'COMPACT_JSON': True,
-    'COERCE_DECIMAL_TO_STRING': True
+    'COERCE_DECIMAL_TO_STRING': True,
+    'UPLOADED_FILES_USE_URL': True
 }
 
 
-- 
cgit v1.2.3