Merge branch 'test/views__' into test/views

.gitlab-ci.yml

@@ -33,9 +33,9 @@ before_script:
     - sed -i.bak -E 's;^REDIS_PASSWD = .*$;REDIS_PASSWD = "";' cof/settings/secret.py
     # Remove the old test database if it has not been done yet
     - psql --username=$POSTGRES_USER --host=$DBHOST -c "DROP DATABASE IF EXISTS test_$POSTGRES_DB"
-    - pip install --cache-dir vendor/pip -t vendor/python -r requirements.txt
+    - pip install --upgrade --cache-dir vendor/pip -t vendor/python -r requirements.txt
 
 test:
     stage: test
     script:
-        - python manage.py test -v3
+        - python manage.py test

requirements.txt

@@ -26,5 +26,8 @@ python-dateutil
 wagtail==1.10.*
 wagtailmenus==2.2.*
 
+# Remove this when we switch to Django 1.11
+djangorestframework==3.6.4
+
 # Production tools
 wheel