Merge feature-sidebar with conflicts

2017-05-27 11:30:22 +03:00
parent 12d7ca0835 14ed32931b
commit 9276f4cafb
7 changed files with 66 additions and 3 deletions
@@ -138,6 +138,7 @@ REST_FRAMEWORK = {
    'DEFAULT_PERMISSION_CLASSES': (
        'rest_framework.permissions.IsAuthenticated',
        'rest_framework.permissions.DjangoModelPermissions',
+        'rest_framework.permissions.IsAdminUser',
    ),
    'DEFAULT_THROTTLE_CLASSES': (
        'members.throttles.BurstRateThrottle',