Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 4689408

Browse files
hawkowlhawkowl
committed
Merge remote-tracking branch 'origin/develop' into shhs
2 parents bed45ab + b491468 commit 4689408

File tree

461 files changed

+17745
-11322
lines changed

Some content is hidden

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

461 files changed

+17745
-11322
lines changed

‎.buildkite/pipeline.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ steps:
55

66
- command:
77
- "python -m pip install tox"
8-
- "tox -e pep8"
9-
label: "\U0001F9F9 PEP-8"
8+
- "tox -e check_codestyle"
9+
label: "\U0001F9F9 Check Style"
1010
plugins:
1111
- docker#v3.0.1:
1212
image: "python:3.6"

‎.circleci/config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
machine: true
55
steps:
66
- checkout
7-
- run: docker build -f docker/Dockerfile --label gitsha1=${CIRCLE_SHA1} -t matrixdotorg/synapse:${CIRCLE_TAG} -t matrixdotorg/synapse:${CIRCLE_TAG}-py3 --build-arg PYTHON_VERSION=3.6 .
7+
- run: docker build -f docker/Dockerfile --label gitsha1=${CIRCLE_SHA1} -t matrixdotorg/synapse:${CIRCLE_TAG} -t matrixdotorg/synapse:${CIRCLE_TAG}-py3 .
88
- run: docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD
99
- run: docker push matrixdotorg/synapse:${CIRCLE_TAG}
1010
- run: docker push matrixdotorg/synapse:${CIRCLE_TAG}-py3
@@ -19,7 +19,7 @@ jobs:
1919
machine: true
2020
steps:
2121
- checkout
22-
- run: docker build -f docker/Dockerfile --label gitsha1=${CIRCLE_SHA1} -t matrixdotorg/synapse:latest -t matrixdotorg/synapse:latest-py3 --build-arg PYTHON_VERSION=3.6 .
22+
- run: docker build -f docker/Dockerfile --label gitsha1=${CIRCLE_SHA1} -t matrixdotorg/synapse:latest -t matrixdotorg/synapse:latest-py3 .
2323
- run: docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD
2424
- run: docker push matrixdotorg/synapse:latest
2525
- run: docker push matrixdotorg/synapse:latest-py3

‎.dockerignore‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
Dockerfile
2-
.travis.yml
3-
.gitignore
4-
demo/etc
5-
tox.ini
6-
.git/*
7-
.tox/*
8-
debian/matrix-synapse/
9-
debian/matrix-synapse-*/
1+
# ignore everything by default
2+
*
3+
4+
# things to include
5+
!docker
6+
!scripts
7+
!synapse
8+
!MANIFEST.in
9+
!README.rst
10+
!setup.py
11+
!synctl
12+
13+
**/__pycache__

‎AUTHORS.rst‎

Lines changed: 3 additions & 0 deletions

‎CHANGES.md‎

Lines changed: 5 additions & 1 deletion

‎INSTALL.md‎

Lines changed: 18 additions & 13 deletions

‎README.rst‎

Lines changed: 25 additions & 7 deletions

‎changelog.d/4276.misc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Improve README section on performance troubleshooting.

‎changelog.d/5015.misc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add logging to 3pid invite signature verification.

‎changelog.d/5042.bugfix‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix bug processing incoming events over federation if call to `/get_missing_events` fails.

0 commit comments

Comments
 (0)