Skip to content

Commit 4e3f9bd

Browse files
committed
Merge branch 'master' of github.com:rtfd/readthedocs.org into humitos/django-pagination/upgrade
2 parents a9239fd + e25acfa commit 4e3f9bd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+72
-1068
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ media/man
3030
media/pdf
3131
media/static
3232
node_modules
33+
package-lock.json
3334
readthedocs/rtd_tests/builds
3435
readthedocs/rtd_tests/tests/builds
3536
user_builds
@@ -45,6 +46,7 @@ readthedocs/htmlcov
4546
tags
4647
.python-version
4748
*.pyo
49+
.pytest_cache/
4850

4951
# Environments
5052
.env

CHANGELOG.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
Version 2.2.1
2+
-------------
3+
4+
Version ``2.2.1`` is a bug fix release for the several issues found in
5+
production during the ``2.2.0`` release.
6+
7+
* `@agjohnson <http://github.com/agjohnson>`_: Hotfix for adding logging call back into project sync task (`#3657 <https://github.com/rtfd/readthedocs.org/pull/3657>`_)
8+
* `@agjohnson <http://github.com/agjohnson>`_: Fix issue with missing setting in oauth SyncRepo task (`#3656 <https://github.com/rtfd/readthedocs.org/pull/3656>`_)
9+
* `@humitos <http://github.com/humitos>`_: Tests for build notifications (`#3654 <https://github.com/rtfd/readthedocs.org/pull/3654>`_)
10+
* `@humitos <http://github.com/humitos>`_: Send proper context to celery email notification task (`#3653 <https://github.com/rtfd/readthedocs.org/pull/3653>`_)
11+
* `@ericholscher <http://github.com/ericholscher>`_: Remove error logging that isn't an error. (`#3650 <https://github.com/rtfd/readthedocs.org/pull/3650>`_)
12+
* `@davidfischer <http://github.com/davidfischer>`_: Update RTD security docs (`#3641 <https://github.com/rtfd/readthedocs.org/pull/3641>`_)
13+
* `@humitos <http://github.com/humitos>`_: Ability to override the creation of the Celery App (`#3623 <https://github.com/rtfd/readthedocs.org/pull/3623>`_)
14+
115
Version 2.2.0
216
-------------
317

0 commit comments

Comments
 (0)