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

Commit

Permalink
Merge branch 'develop' into babolivier/invite-json
Browse files Browse the repository at this point in the history
  • Loading branch information
babolivier committed Jul 8, 2019
2 parents c142e5d + 4b1f7fe commit 57eacee
Show file tree
Hide file tree
Showing 241 changed files with 2,403 additions and 1,918 deletions.
9 changes: 6 additions & 3 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,11 +173,12 @@ steps:
queue: "medium"
command:
- "bash .buildkite/merge_base_branch.sh"
- "bash .buildkite/synapse_sytest.sh"
- "bash /synapse_sytest.sh"
plugins:
- docker#v3.0.1:
image: "matrixdotorg/sytest-synapse:py35"
propagate-environment: true
always-pull: true
retry:
automatic:
- exit_status: -1
Expand All @@ -192,11 +193,12 @@ steps:
POSTGRES: "1"
command:
- "bash .buildkite/merge_base_branch.sh"
- "bash .buildkite/synapse_sytest.sh"
- "bash /synapse_sytest.sh"
plugins:
- docker#v3.0.1:
image: "matrixdotorg/sytest-synapse:py35"
propagate-environment: true
always-pull: true
retry:
automatic:
- exit_status: -1
Expand All @@ -212,11 +214,12 @@ steps:
WORKERS: "1"
command:
- "bash .buildkite/merge_base_branch.sh"
- "bash .buildkite/synapse_sytest.sh"
- "bash /synapse_sytest.sh"
plugins:
- docker#v3.0.1:
image: "matrixdotorg/sytest-synapse:py35"
propagate-environment: true
always-pull: true
soft_fail: true
retry:
automatic:
Expand Down
145 changes: 0 additions & 145 deletions .buildkite/synapse_sytest.sh

This file was deleted.

5 changes: 3 additions & 2 deletions .github/ISSUE_TEMPLATE/SUPPORT_REQUEST.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ about: I need support for Synapse

---

# Please ask for support in [**#matrix:matrix.org**](https://matrix.to/#/#matrix:matrix.org)
Please don't file github issues asking for support.

## Don't file an issue as a support request.
Instead, please join [`#synapse:matrix.org`](https://matrix.to/#/#synapse:matrix.org)
(from a matrix.org account if necessary), and ask there.
6 changes: 3 additions & 3 deletions .github/SUPPORT.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[**#matrix:matrix.org**](https://matrix.to/#/#matrix:matrix.org) is the official support room for Matrix, and can be accessed by any client from https://matrix.org/docs/projects/try-matrix-now.html

It can also be access via IRC bridge at irc://irc.freenode.net/matrix or on the web here: https://webchat.freenode.net/?channels=matrix
[**#synapse:matrix.org**](https://matrix.to/#/#synapse:matrix.org) is the official support room for
Synapse, and can be accessed by any client from https://matrix.org/docs/projects/try-matrix-now.html.
Please ask for support there, rather than filing github issues.
Loading

0 comments on commit 57eacee

Please sign in to comment.