Merge branch 'master' into refactor-search-view

stsewd · stsewd · commit d4ea13b86b2f · 2020-03-09T17:05:14.000-05:00
diff --git a/docs/conf.py b/docs/conf.py
@@ -62,8 +62,6 @@ def get_version():
 latex_documents = [
     ('index', 'ReadTheDocs.tex', u'Read the Docs Documentation',
      u'Eric Holscher, Charlie Leifer, Bobby Grace', 'manual'),
-    ('terms-of-service', 'readthedocs-tos.tex', u'Read the Docs - Terms of Service',
-     u'Read the Docs, Inc', 'manual'),
 ]
 man_pages = [
     ('index', 'read-the-docs', u'Read the Docs Documentation',
diff --git a/requirements/deploy.txt b/requirements/deploy.txt
@@ -5,4 +5,4 @@ gunicorn==19.9.0
 django-redis-cache==2.1.0
 
 #For resizing images
-pillow==6.2.1
+pillow==7.0.0
diff --git a/requirements/docker.txt b/requirements/docker.txt
@@ -4,7 +4,7 @@ psycopg2-binary==2.8.3
 django-redis-cache==2.1.0
 
 # For resizing images
-pillow==6.2.0
+pillow==7.0.0
 
 # local debugging tools
 watchdog==0.9.0
diff --git a/requirements/pip.txt b/requirements/pip.txt
@@ -3,7 +3,7 @@ pip==19.3.1
 appdirs==1.4.3
 virtualenv==16.7.7
 
-django==2.2.10  # pyup: <2.3
+django==2.2.11  # pyup: <2.3
 django-extensions==2.2.5
 django_polymorphic==2.1.2
 
@@ -40,7 +40,7 @@ kombu==4.3.0  # pyup: ignore
 # when ALWAYS_EAGER = True
 celery==4.1.1  # pyup: ignore
 
-django-allauth==0.40.0
+django-allauth==0.41.0
 
 GitPython==3.0.8
 

Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,6 @@ def get_version():`
`62`	`62`	`latex_documents = [`
`63`	`63`	`('index', 'ReadTheDocs.tex', u'Read the Docs Documentation',`
`64`	`64`	`u'Eric Holscher, Charlie Leifer, Bobby Grace', 'manual'),`
`65`		`- ('terms-of-service', 'readthedocs-tos.tex', u'Read the Docs - Terms of Service',`
`66`		`- u'Read the Docs, Inc', 'manual'),`
`67`	`65`	`]`
`68`	`66`	`man_pages = [`
`69`	`67`	`('index', 'read-the-docs', u'Read the Docs Documentation',`