Skip to content

Commit

Permalink
Merge branch 'release/5.14.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
ericholscher committed Apr 6, 2021
2 parents 34c9edf + fe3f031 commit 924699c
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
Version 5.14.0
--------------

:Date: April 06, 2021

This release includes a security update which was done in a private branch PR.
See our `security changelog <https://docs.readthedocs.io/en/latest/security.html#version-5-14-0>`__ for more details.

* `@pyup-bot <https://github.com/pyup-bot>`__: pyup: Scheduled weekly dependency update for week 14 (`#8071 <https://github.com/readthedocs/readthedocs.org/pull/8071>`__)
* `@astrojuanlu <https://github.com/astrojuanlu>`__: Clarify ad-free conditions (`#8064 <https://github.com/readthedocs/readthedocs.org/pull/8064>`__)
* `@humitos <https://github.com/humitos>`__: SSO: add small paragraph mentioning how to enable it on commercial (`#8063 <https://github.com/readthedocs/readthedocs.org/pull/8063>`__)
* `@stsewd <https://github.com/stsewd>`__: Build environment: allow to run commands with a custom user (`#8058 <https://github.com/readthedocs/readthedocs.org/pull/8058>`__)
* `@humitos <https://github.com/humitos>`__: Design document for new Docker images structure (`#7566 <https://github.com/readthedocs/readthedocs.org/pull/7566>`__)

Version 5.13.0
--------------

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"bowser": "^1.9.3",
"cssfilter": "0.0.8",
"github-changelog": "github:agjohnson/github-changelog",
"github-changelog": "git+https://github.com/agjohnson/github-changelog.git",
"npm": "^6.1.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = readthedocs
version = 5.13.0
version = 5.14.0
license = MIT
description = Read the Docs builds and hosts documentation
author = Read the Docs, Inc
Expand Down

0 comments on commit 924699c

Please sign in to comment.