Merge branch 'develop' into travis/login-terms

.travis.yml

 sudo: false
 language: python
 
-# tell travis to cache ~/.cache/pip
-cache: pip
+cache:
+  directories:
+    # we only bother to cache the wheels; parts of the http cache get
+    # invalidated every build (because they get served with a max-age of 600
+    # seconds), which means that we end up re-uploading the whole cache for
+    # every build, which is time-consuming In any case, it's not obvious that
+    # downloading the cache from S3 would be much faster than downloading the
+    # originals from pypi.
+    #
+    - $HOME/.cache/pip/wheels
+
+# don't clone the whole repo history, one commit will do
+git:
+  depth: 1
 
 # only build branches we care about (PRs are built seperately)
 branches:
@@ -11,10 +23,9 @@ branches:
     - develop
     - /^release-v/
 
-before_script:
-  - git remote set-branches --add origin develop
-  - git fetch origin develop
-
+# When running the tox environments that call Twisted Trial, we can pass the -j
+# flag to run the tests concurrently. We set this to 2 for CPU bound tests
+# (SQLite) and 4 for I/O bound tests (PostgreSQL).
 matrix:
   fast_finish: true
   include:
@@ -22,13 +33,13 @@ matrix:
     env: TOX_ENV=packaging
 
   - python: 3.6
-    env: TOX_ENV=pep8
+    env: TOX_ENV="pep8,check_isort"
 
   - python: 2.7
-    env: TOX_ENV=py27
+    env: TOX_ENV=py27 TRIAL_FLAGS="-j 2"
 
   - python: 2.7
-    env: TOX_ENV=py27-old
+    env: TOX_ENV=py27-old TRIAL_FLAGS="-j 2"
 
   - python: 2.7
     env: TOX_ENV=py27-postgres TRIAL_FLAGS="-j 4"
@@ -36,21 +47,24 @@ matrix:
       - postgresql
 
   - python: 3.5
-    env: TOX_ENV=py35
+    env: TOX_ENV=py35 TRIAL_FLAGS="-j 2"
 
   - python: 3.6
-    env: TOX_ENV=py36
+    env: TOX_ENV=py36 TRIAL_FLAGS="-j 2"
 
   - python: 3.6
     env: TOX_ENV=py36-postgres TRIAL_FLAGS="-j 4"
     services:
       - postgresql
 
-  - python: 3.6
-    env: TOX_ENV=check_isort
-
-  - python: 3.6
+  - # we only need to check for the newsfragment if it's a PR build
+    if: type = pull_request
+    python: 3.6
     env: TOX_ENV=check-newsfragment
+    script:
+      - git remote set-branches --add origin develop
+      - git fetch origin develop
+      - tox -e $TOX_ENV
 
 install:
   - pip install tox

README.rst

@@ -657,7 +657,8 @@ Using a reverse proxy with Synapse
 
 It is recommended to put a reverse proxy such as
 `nginx <https://nginx.org/en/docs/http/ngx_http_proxy_module.html>`_,
-`Apache <https://httpd.apache.org/docs/current/mod/mod_proxy_http.html>`_ or
+`Apache <https://httpd.apache.org/docs/current/mod/mod_proxy_http.html>`_,
+`Caddy <https://caddyserver.com/docs/proxy>`_ or
 `HAProxy <https://www.haproxy.org/>`_ in front of Synapse. One advantage of
 doing so is that it means that you can expose the default https port (443) to
 Matrix clients without needing to run Synapse with root privileges.
@@ -688,7 +689,15 @@ so an example nginx configuration might look like::
       }
   }
 
-and an example apache configuration may look like::
+an example Caddy configuration might look like::
+
+    matrix.example.com {
+      proxy /_matrix http://localhost:8008 {
+        transparent
+      }
+    }
+
+and an example Apache configuration might look like::
 
     <VirtualHost *:443>
         SSLEngine on

changelog.d/3975.feature

+Servers with auto-join rooms will now automatically create those rooms when the first user registers

changelog.d/4006.misc

+Delete unreferenced state groups during history purge

changelog.d/4011.misc

+Reduce database load when fetching state groups

changelog.d/4051.feature

+Add config option to control alias creation

changelog.d/4072.misc

+The README now contains example for the Caddy web server. Contributed by steamp0rt.

changelog.d/4081.bugfix

+Fix race condition where config defined reserved users were not being added to
+the monthly active user list prior to the homeserver reactor firing up

changelog.d/4085.feature

+The register_new_matrix_user script is now ported to Python 3.

changelog.d/4089.feature

+ Configure Docker image to listen on both ipv4 and ipv6.

changelog.d/4091.feature

+Support for replacing rooms with new ones

changelog.d/4095.bugfix

+Fix exceptions when using the email mailer on Python 3.

changelog.d/4099.feature

+Support for replacing rooms with new ones

changelog.d/4100.feature

+Support for replacing rooms with new ones

changelog.d/4101.feature

+Support for replacing rooms with new ones

changelog.d/4106.removal

+The disused and un-specced identicon generator has been removed.

changelog.d/4108.misc

+The "Received rdata" log messages on workers is now logged at DEBUG, not INFO.

changelog.d/4109.misc

+Reduce replication traffic for device lists

changelog.d/4110.misc

+Fix `synapse_replication_tcp_protocol_*_commands` metric label to be full command name, rather than just the first character

changelog.d/4118.removal

+The obsolete and non-functional /pull federation endpoint has been removed.