Skip to content

Commit 36dc0e7

Browse files
committed
Merge branch 'master' into downgrade-test-req
2 parents a4430fd + 4d91f61 commit 36dc0e7

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

CHANGELOG.rst

+1-3
Original file line numberDiff line numberDiff line change
@@ -986,14 +986,12 @@ Version 2.3.1
986986
* `@humitos <http://github.com/humitos>`__: Upgrade all packages using `pur` tool (`#2916 <https://github.com/rtfd/readthedocs.org/pull/2916>`__)
987987
* `@rixx <http://github.com/rixx>`__: Fix page redirect preview (`#2711 <https://github.com/rtfd/readthedocs.org/pull/2711>`__)
988988

989-
.. _version-2.3.0:
990-
991989
Version 2.3.0
992990
-------------
993991

994992
.. warning::
995993
Version 2.3.0 includes a security fix for project translations. See
996-
:ref:`security-2.3.0` for more information
994+
:ref:`security:Release 2.3.0` for more information
997995

998996
* `@stsewd <http://github.com/stsewd>`__: Fix tox env for coverage (`#3772 <https://github.com/rtfd/readthedocs.org/pull/3772>`__)
999997
* `@humitos <http://github.com/humitos>`__: Try to fix end of file (`#3761 <https://github.com/rtfd/readthedocs.org/pull/3761>`__)

docs/security.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Security issue archive
8787
Version 3.2.0
8888
~~~~~~~~~~~~~
8989

90-
:ref:`version-3.2.0` resolved an issue where a specially crafted request
90+
:ref:`changelog:Version 3.2.0` resolved an issue where a specially crafted request
9191
could result in a DNS query to an arbitrary domain.
9292

9393
This issue was found by `Cyber Smart Defence <https://www.cybersmartdefence.com/>`_
@@ -98,7 +98,7 @@ of Read the Docs.
9898
Release 2.3.0
9999
~~~~~~~~~~~~~
100100

101-
:ref:`version-2.3.0` resolves a security issue with translations on our community
101+
:ref:`changelog:Version 2.3.0` resolves a security issue with translations on our community
102102
hosting site that allowed users to modify the hosted path of a target project by
103103
adding it as a translation project of their own project. A check was added to
104104
ensure project ownership before adding the project as a translation.

requirements/local-docs-build.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Base packages
44
docutils==0.14
55
Sphinx==1.8.4
6-
sphinx_rtd_theme==0.4.2
6+
sphinx_rtd_theme==0.4.3
77
sphinx-tabs==1.1.10
88
# Required to avoid Transifex error with reserved slug
99
# https://github.com/sphinx-doc/sphinx-intl/pull/27

requirements/pip.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ celery==4.1.1 # pyup: ignore
3636
django-allauth==0.38.0
3737

3838
# VCS
39-
httplib2==0.12.0
39+
httplib2==0.12.1
4040

4141
# GitPython 2.1.11 makes TestGitBackend.test_git_tags to fail because
4242
# of an UnicodeError
@@ -66,7 +66,7 @@ beautifulsoup4==4.7.1
6666
Unipath==1.1
6767
django-kombu==0.9.4
6868
mock==2.0.0
69-
stripe==2.20.3
69+
stripe==2.21.0
7070

7171
django-formtools==2.1
7272

0 commit comments

Comments
 (0)