diff options
| author | Eric Buehl | 2014-03-06 20:21:27 +0000 |
|---|---|---|
| committer | Eric Buehl | 2014-03-06 20:21:27 +0000 |
| commit | 86375f2d9506bcd3c95cb9901d2237672a47da3f (patch) | |
| tree | 55dcac0cbfc105bd318ca1c4f8743e8caaec4eda | |
| parent | e0682e9298092721c0d3eb358ce4be8039e7ccf6 (diff) | |
| parent | ef94861c2d31592c3760a0c0758beb084f452c03 (diff) | |
| download | django-rest-framework-86375f2d9506bcd3c95cb9901d2237672a47da3f.tar.bz2 | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | docs/topics/release-notes.md | 11 | ||||
| -rw-r--r-- | rest_framework/__init__.py | 4 | ||||
| -rw-r--r-- | rest_framework/serializers.py | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 14503148..0010f687 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,6 +40,17 @@ You can determine your currently installed version using `pip freeze`: ## 2.3.x series +### 2.3.13 + +**Date**: 6th March 2014 + +* Django 1.7 Support. +* Fix `default` argument when used with serializer relation fields. +* Display the media type of the content that is being displayed in the browsable API, rather than 'text/html'. +* Bugfix for `urlize` template failure when URL regex is matched, but value does not `urlparse`. +* Use `urandom` for token generation. +* Only use `Vary: Accept` when more than one renderer exists. + ### 2.3.12 **Date**: 15th January 2014 diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 6759680b..2d76b55d 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,10 +8,10 @@ ______ _____ _____ _____ __ _ """ __title__ = 'Django REST framework' -__version__ = '2.3.12' +__version__ = '2.3.13' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' -__copyright__ = 'Copyright 2011-2013 Tom Christie' +__copyright__ = 'Copyright 2011-2014 Tom Christie' # Version synonym VERSION = __version__ diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 10256d47..c95b0593 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -758,7 +758,7 @@ class ModelSerializer(Serializer): ret[accessor_name] = field - # Add the `read_only` flag to any fields that have bee specified + # Add the `read_only` flag to any fields that have been specified # in the `read_only_fields` option for field_name in self.opts.read_only_fields: assert field_name not in self.base_fields.keys(), ( |