Skip to content

Commit 1b474bf

Browse files
authored
Merge branch 'main' into feat/allow_override_user
2 parents 319c22e + 0e2b508 commit 1b474bf

File tree

133 files changed

+3865
-1873
lines changed

Some content is hidden

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

133 files changed

+3865
-1873
lines changed

.devcontainer/.env

Lines changed: 0 additions & 1 deletion
This file was deleted.

.devcontainer/Dockerfile

Lines changed: 0 additions & 10 deletions
This file was deleted.

.devcontainer/devcontainer.json

Lines changed: 0 additions & 40 deletions
This file was deleted.

.devcontainer/docker-compose.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

.github/workflows/build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ jobs:
322322
merge-multiple: true
323323

324324
- name: Prepare a release
325-
uses: softprops/action-gh-release@v2
325+
uses: softprops/action-gh-release@v2.3.2
326326
with:
327327
generate_release_notes: true
328328
body: |
@@ -391,7 +391,7 @@ jobs:
391391
await script({ core, github, context });
392392
393393
- name: Update unstable release
394-
uses: softprops/action-gh-release@v2
394+
uses: softprops/action-gh-release@v2.3.2
395395
with:
396396
name: "Unstable build"
397397
tag_name: unstable

CONTRIBUTING.md

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -2,60 +2,4 @@
22

33
Thank you for taking the time to contribute to Matrix!
44

5-
This is the repository for MAS (Matrix Authentication Service), an OAuth 2.0 and OpenID Provider server for Matrix.
6-
75
Please see the [contributors' guide](https://element-hq.github.io/matrix-authentication-service/development/contributing.html) in our rendered documentation.
8-
9-
## Sign off
10-
11-
We ask that everybody who contributes to this project signs off their contributions, as explained below.
12-
13-
We follow a simple 'inbound=outbound' model for contributions: the act of submitting an 'inbound' contribution means that the contributor agrees to license their contribution under the same terms as the project's overall 'outbound' license - in our case, this is Apache Software License v2 (see [LICENSE](./LICENSE)).
14-
15-
In order to have a concrete record that your contribution is intentional and you agree to license it under the same terms as the project's license, we've adopted the same lightweight approach used by the [Linux Kernel](https://www.kernel.org/doc/html/latest/process/submitting-patches.html), [Docker](https://github.com/docker/docker/blob/master/CONTRIBUTING.md), and many other projects: the [Developer Certificate of Origin](https://developercertificate.org/) (DCO). This is a simple declaration that you wrote the contribution or otherwise have the right to contribute it to Matrix:
16-
17-
```
18-
Developer Certificate of Origin
19-
Version 1.1
20-
21-
Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
22-
660 York Street, Suite 102,
23-
San Francisco, CA 94110 USA
24-
25-
Everyone is permitted to copy and distribute verbatim copies of this
26-
license document, but changing it is not allowed.
27-
28-
Developer's Certificate of Origin 1.1
29-
30-
By making a contribution to this project, I certify that:
31-
32-
(a) The contribution was created in whole or in part by me and I
33-
have the right to submit it under the open source license
34-
indicated in the file; or
35-
36-
(b) The contribution is based upon previous work that, to the best
37-
of my knowledge, is covered under an appropriate open source
38-
license and I have the right under that license to submit that
39-
work with modifications, whether created in whole or in part
40-
by me, under the same open source license (unless I am
41-
permitted to submit under a different license), as indicated
42-
in the file; or
43-
44-
(c) The contribution was provided directly to me by some other
45-
person who certified (a), (b) or (c) and I have not modified
46-
it.
47-
48-
(d) I understand and agree that this project and the contribution
49-
are public and that a record of the contribution (including all
50-
personal information I submit with it, including my sign-off) is
51-
maintained indefinitely and may be redistributed consistent with
52-
this project or the open source license(s) involved.
53-
```
54-
55-
If you agree to this for your contribution, then all that's needed is to include the line in your commit or pull request comment:
56-
57-
```
58-
Signed-off-by: Your Name <[email protected]>
59-
```
60-
61-
Git allows you to add this signoff automatically when using the `-s` flag to `git commit`, which uses the name and email set in your `user.name` and `user.email` git configs.

0 commit comments

Comments
 (0)