From 2e534b31c1273bbbe13236e162ced755faf4183f Mon Sep 17 00:00:00 2001 From: Anna Ossowski Date: Tue, 18 Jul 2017 01:14:49 -0700 Subject: [PATCH 1/6] Removed Micropyramid as a sponsor (#5280) --- README.md | 1 - docs/index.md | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index d710f3d4a..5a8857a71 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,6 @@ The initial aim is to provide a single full-time position on REST framework. -

*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), [Machinalis](https://hello.machinalis.co.uk/), [Rollbar](https://rollbar.com), and [MicroPyramid](https://micropyramid.com/django-rest-framework-development-services/).* diff --git a/docs/index.md b/docs/index.md index 23433a6b7..fbb5bc1bb 100644 --- a/docs/index.md +++ b/docs/index.md @@ -75,11 +75,10 @@ continued development by **[signing up for a paid plan][funding]**.
  • Stream
  • Machinalis
  • Rollbar
    • -
  • MicroPyramid
    • -*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), [Machinalis](https://hello.machinalis.co.uk/), [Rollbar](https://rollbar.com), and [MicroPyramid](https://micropyramid.com/django-rest-framework-development-services/).* +*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), [Machinalis](https://hello.machinalis.co.uk/), and [Rollbar](https://rollbar.com).* --- From 0c9c951c1d144c397a47ff25883ae573e61d5ef4 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 18 Jul 2017 09:15:22 +0100 Subject: [PATCH 2/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5a8857a71..cef407af4 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ The initial aim is to provide a single full-time position on REST framework.

    -*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), [Machinalis](https://hello.machinalis.co.uk/), [Rollbar](https://rollbar.com), and [MicroPyramid](https://micropyramid.com/django-rest-framework-development-services/).* +*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), [Machinalis](https://hello.machinalis.co.uk/), and [Rollbar].* --- From 2d4226c2bd1bd959cfb9a8887b347435b63909c9 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 18 Jul 2017 09:16:13 +0100 Subject: [PATCH 3/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cef407af4..814da6e92 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ The initial aim is to provide a single full-time position on REST framework.

    -*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), [Machinalis](https://hello.machinalis.co.uk/), and [Rollbar].* +*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), [Machinalis](https://hello.machinalis.co.uk/), and [Rollbar](https://rollbar.com/).* --- From 9ec89141ee1cacbf2b10400597242e664a7656a7 Mon Sep 17 00:00:00 2001 From: minusf Date: Thu, 20 Jul 2017 23:42:51 +0200 Subject: [PATCH 4/6] typo: may -> many --- rest_framework/exceptions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index e84074a07..aac31c453 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -129,8 +129,8 @@ class ValidationError(APIException): if code is None: code = self.default_code - # For validation failures, we may collect may errors together, so the - # details should always be coerced to a list if not already. + # For validation failures, we may collect many errors together, + # so the details should always be coerced to a list if not already. if not isinstance(detail, dict) and not isinstance(detail, list): detail = [detail] From ad501d41f5db7267e1a4484d0afcafe9ba24800e Mon Sep 17 00:00:00 2001 From: Didi Hoffmann Date: Mon, 31 Jul 2017 14:50:36 +0200 Subject: [PATCH 5/6] Added the django user model So it is possible to copy paste the example and it will work out of the box. --- docs/api-guide/views.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/views.md b/docs/api-guide/views.md index c0c4f67e4..abf5351c7 100644 --- a/docs/api-guide/views.md +++ b/docs/api-guide/views.md @@ -19,10 +19,10 @@ REST framework provides an `APIView` class, which subclasses Django's `View` cla Using the `APIView` class is pretty much the same as using a regular `View` class, as usual, the incoming request is dispatched to an appropriate handler method such as `.get()` or `.post()`. Additionally, a number of attributes may be set on the class that control various aspects of the API policy. For example: - from rest_framework.views import APIView from rest_framework.response import Response from rest_framework import authentication, permissions + from django.contrib.auth.models import User class ListUsers(APIView): """ From 1368d3677ccf8756f771696dff04eb721819171e Mon Sep 17 00:00:00 2001 From: Didi Hoffmann Date: Mon, 31 Jul 2017 15:00:26 +0200 Subject: [PATCH 6/6] Added the separator line back Accidentally also deleted a line. --- docs/api-guide/views.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/api-guide/views.md b/docs/api-guide/views.md index abf5351c7..4fa36d0fc 100644 --- a/docs/api-guide/views.md +++ b/docs/api-guide/views.md @@ -19,6 +19,7 @@ REST framework provides an `APIView` class, which subclasses Django's `View` cla Using the `APIView` class is pretty much the same as using a regular `View` class, as usual, the incoming request is dispatched to an appropriate handler method such as `.get()` or `.post()`. Additionally, a number of attributes may be set on the class that control various aspects of the API policy. For example: + from rest_framework.views import APIView from rest_framework.response import Response from rest_framework import authentication, permissions