Merge branch 'master' into remove-gevent

Author: tmbo

.github/workflows/automatic-pr-merger.yml

@@ -22,4 +22,4 @@ jobs:
       - uses: actions/checkout@v2
       - uses: rasahq/[email protected]
         with:
-          token: ${{ secrets.RASABOT_AUTOMERGE_GITHUB_TOKEN }}
+          token: ${{ secrets.RASABOT_AUTOMERGE_GITHUB_TOKEN || secrets.GITHUB_TOKEN}}

.github/workflows/continous-integration.yml

@@ -106,7 +106,8 @@ jobs:
         make install-full
         poetry run python -c "from scripts import release; release.generate_changelog('major.minor.patch')"
         export SPHINXBUILD=$(poetry run which sphinx-build)
-        cd docs && make SPHINXBUILD=$SPHINXBUILD SPHINXOPTS="-W --keep-going -A html_theme=rasabaster" html
+        cd docs && make SPHINXBUILD=$SPHINXBUILD SPHINXOPTS="-W --keep-going -A html_theme=rasabaster" html && make SPHINXBUILD=$SPHINXBUILD linkcheck
+        
 
   test:
     name: Run Tests

CHANGELOG.rst

@@ -39,7 +39,7 @@ Features
 
   .. note::
 
-      Composite entities are currently just supported by the :ref:``diet-classifier`` and :ref:``CRFEntityExtractor``.
+      Composite entities are currently just supported by the :ref:`diet-classifier` and :ref:`CRFEntityExtractor`.
 - `#5465 <https://github.com/rasahq/rasa/issues/5465>`_: Update training data format for NLU to support entities with a role or group label.
 
   You can now specify synonyms, roles, and groups of entities using the following data format:
@@ -66,7 +66,7 @@ Features
 
   The markdown format ``[LA](location:Los Angeles)`` is deprecated. To update your training data file just
   execute the following command on the terminal of your choice:
-  ``sed -i .deprecated -E 's/\[(.*)\]\((.*):(.*)\)/\[\1\]\{"entity": "\2", "value": "\3"\}/g' nlu.md``
+  ``sed -i -E 's/\[([^)]+)\]\(([^)]+):([^)]+)\)/[\1]{"entity": "\2", "value": "\3"}/g' nlu.md``
 
   For more information about the new data format see :ref:`training-data-format`.
 
@@ -939,8 +939,8 @@ Features
 - ``CRFEntityExtractor`` updated to accept arbitrary token-level features like word
   vectors (issues/4214)
 - ``SpacyFeaturizer`` updated to add ``ner_features`` for ``CRFEntityExtractor``
-- Sanitizing incoming messages from slack to remove slack formatting like <mailto:[email protected]|[email protected]>
-  or <http://url.com|url.com> and substitute it with original content
+- Sanitizing incoming messages from slack to remove slack formatting like ``<mailto:[email protected]|[email protected]>``
+  or ``<http://url.com|url.com>`` and substitute it with original content
 - Added the ability to configure the number of Sanic worker processes in the HTTP
   server (``rasa.server``) and input channel server
   (``rasa.core.agent.handle_channels()``). The number of workers can be set using the
@@ -1705,4 +1705,4 @@ Bugfixes
 
 .. _`master`: https://github.com/RasaHQ/rasa/
 
-.. _`Semantic Versioning`: http://semver.org/
+.. _`Semantic Versioning`: https://semver.org/

CONTRIBUTING.md

@@ -12,7 +12,7 @@
     - [Draft PRs](#draft-prs)
     - [PRs should be a reasonable length](#prs-should-be-a-reasonable-length)
     - [Code style](#code-style)
-    - [Formatting and Type Checking](#### Formatting and Type Checking)
+    - [Formatting and Type Checking](#Formatting and Type Checking)
 - [How to open a PR and contribute code to Rasa Open Source](#how-to-open-a-pr-and-contribute-code-to-rasa-open-source)
   - [1. Forking the Rasa Repository](#1-forking-the-rasa-repository)
   - [2. Cloning the Forked Repository Locally](#2-cloning-the-forked-repository-locally)

changelog/4745.feature.rst

@@ -0,0 +1,4 @@
+Added template name to the metadata of bot utterance events.
+
+``BotUttered`` event contains a ``template_name`` property in its metadata for any
+new bot message.

changelog/5086.feature.rst

@@ -0,0 +1 @@
+Added a ``--num-threads`` CLI argument that can be passed to ``rasa train`` and will be used to train NLU components.

changelog/5135.bugfix.rst

@@ -0,0 +1 @@
+Fixed Rasa shell skipping button messages if buttons are attached to a message previous to the latest.

changelog/5617.bugfix.rst

@@ -0,0 +1 @@
+Don't create TensorBoard log files during prediction.

changelog/5637.enhancement.rst renamed to changelog/5637.improvement.rst

@@ -0,0 +1 @@
+Fix: DIET breaks with empty spaCy model