952fb75795
add shutdown handler to kick sync
2021-07-14 14:50:07 +02:00
f3e806096b
Merge branch 'clippy-fix' into 'master'
...
Fix clippy lint
See merge request famedly/conduit!121
2021-07-14 10:57:44 +00:00
e1b89c1248
apply lint suggestions and version bump
2021-07-14 12:31:38 +02:00
be6b6c3cf0
Merge branch 'rocket-update' into 'master'
...
Update rocket to rc1 and lock file
See merge request famedly/conduit!120
2021-07-14 09:48:17 +00:00
15471d9ac4
update rocket and lock
2021-07-14 11:28:24 +02:00
3c236fb671
Merge branch 'sqlite' into 'master'
...
Sqlite
See merge request famedly/conduit!114
2021-07-14 07:07:09 +00:00
9d4fa9a220
Sqlite
2021-07-14 07:07:08 +00:00
bd4bd58612
Merge branch 'capabilities_auth' into 'master'
...
Getting capabilities requires authentication
See merge request famedly/conduit!117
2021-07-13 07:55:19 +00:00
0eec1cc696
Merge branch 'ci-tag-jobs-with-docker' into 'master'
...
Better CI (run on faster CI hosts, incremental release builds, thin-lto)
See merge request famedly/conduit!118
2021-07-12 20:35:00 +00:00
3fa09ff57d
Use thin-lto [1] for "better" release builds.
...
This performs a rather quick variant of Link Time Optimization [2].
It should add negligible build time but also more optimized binaries.
[1]: https://doc.rust-lang.org/cargo/reference/profiles.html#lto
[2]: https://llvm.org/docs/LinkTimeOptimization.html
2021-07-12 20:21:13 +00:00
0080932aef
Speed up release builds
...
Setting cargo to run incremental builds means partial build results should be cached. This is not enabled by default in release mode.
Incremental builds use 256 codegen units by default [1].
We set them to 16 (release default) again for somewhat faster code but slightly slower builds.
[1]: https://doc.rust-lang.org/cargo/reference/profiles.html#codegen-units
2021-07-12 20:18:14 +00:00
888a2f7fa1
Make CI run on famedly runners
...
By default, jobs without tags only run on CI runners configured to do so [1].
Conduit can use famedly runners, which are more powerfull than gitlab's runners, but require a tag on the job to run it there.
This commit tags each job with the "docker" tag.
On the famedly/conduit repo this means faster CI.
On other gitlab.com forks the normal ci.
Selfhosted gitlab's might need to add a "docker" tag to their runner.
[1]: https://docs.gitlab.com/ee/ci/runners/configure_runners.html#use-tags-to-limit-the-number-of-jobs-using-the-runner
2021-07-12 19:58:35 +00:00
dcb5e5900f
Getting capabilities requires authentication
2021-07-11 22:07:10 +02:00
4732aa6782
Merge branch 'invalid_utf8' into 'master'
...
Return proper error in case of invalid UTF-8
See merge request famedly/conduit!110
2021-07-11 13:44:27 +00:00
699f77671f
Return proper error in case of invalid UTF-8 in json_body
...
json_body is used in places that need authentication. In
case an unknown field is set, Ruma doesn't parse the field
and so doesn't give an error on invalid UTF-8. But Conduit
has parsed and on error makes json_body None. Return an
error to the client instead of generating an internal error.
2021-07-11 14:47:13 +02:00
fcfb9b51de
Merge branch 'fix-ci-failing-duplicate-nightly-release' into 'master'
...
Fix: Duplicate releases don't work, remove nightly
Closes #100
See merge request famedly/conduit!113
2021-07-11 11:43:48 +00:00
36681dd3ac
Fix: Duplicate releases don't work, remove nightly
2021-07-11 11:43:48 +00:00
13c0beafa6
Merge branch 'lib-fix' into 'master'
...
Export conduits Config struct and fix clippy warnings
See merge request famedly/conduit!99
2021-07-11 11:42:07 +00:00
a313a93ff5
Merge branch 'master' into 'master'
...
Change default port in docker to the new
See merge request famedly/conduit!115
2021-07-11 11:41:12 +00:00
6a96cfaac1
Change default port in docker to the new
...
conduit default port 6167 and fix the docker healthcheck
2021-07-06 10:43:33 +02:00
787e18b2a4
Merge branch 'jfowl-master-patch-57056' into 'master'
...
Fix: Nightly release tag name should not be a branch name
See merge request famedly/conduit!112
2021-07-02 15:18:26 +00:00
fcc30f059e
Fix: Nightly release tag name should not be a branch name
...
According to tulir this breaks the GitLab Matrix bot, and nightly is a better match anyway
2021-07-02 14:58:00 +00:00
f1a2aa3a94
Merge branch 'jfowl-master-patch-97252' into 'master'
...
Publish master builds as nightly releases & also build debs
See merge request famedly/conduit!111
2021-07-02 12:26:27 +00:00
a7cb1c999a
Publish master builds as nightly releases & also build debs
2021-07-02 12:26:26 +00:00
5711467ad9
Merge branch 'state-res-closure' into 'master'
...
Remove auth_cache using a closure to fetch events in state-res
See merge request famedly/conduit!108
2021-07-02 10:56:21 +00:00
c30cc50a0b
Switch ruma to a commit from next
2021-07-02 06:40:40 -04:00
5f6b0c673c
Merge branch 'feature/proxy' into 'master'
...
add support for arbitrary proxies
See merge request famedly/conduit!54
2021-07-01 19:46:18 +00:00
c53cc03ff8
address pr comments
2021-07-01 13:38:25 -06:00
af903ceac3
Merge branch 'ci-build-artifacts-1' into 'master'
...
Generate binaries for 3 architectures in the CI
See merge request famedly/conduit!94
2021-07-01 19:06:40 +00:00
f25f61d4a9
fix errors introduced by rebase
2021-07-01 12:48:12 -06:00
b2d5516058
add support for arbitrary proxies
2021-07-01 12:41:12 -06:00
1bb84a8e2d
Fix docs for fetch_and_handle_events
2021-06-30 07:48:16 -04:00
98f1480e2b
Remove auth_cache using a closure to fetch events in state-res
2021-06-30 12:54:19 +02:00
cc9111059d
Merge branch 'search-impovements' into 'master'
...
improvement: /search works for multiple rooms
See merge request famedly/conduit!106
2021-06-30 08:32:55 +00:00
05821d6fd5
improvement: pdu cache, /sync cache
2021-06-30 10:31:34 +02:00
09a8737f24
Export conduits Config struct and fix clipp warningsy
2021-06-29 16:02:12 -04:00
dcac1361ec
improvement: /search works for multiple rooms
2021-06-21 15:21:00 +02:00
fee7d3d2e3
Merge branch 'allow_appservice_registration' into 'master'
...
Always allow appservices to register new users
See merge request famedly/conduit!105
2021-06-21 10:15:48 +00:00
1a70ea5702
Merge branch 'upgrade-deps' into 'master'
...
Upgrade Ruma
See merge request famedly/conduit!104
2021-06-21 10:14:12 +00:00
637d9d3b6f
Always allow appservices to register new users
2021-06-19 16:12:05 +02:00
808741bcb6
Remove unnecessary Option-wrapping and successive unwrapping
2021-06-17 20:44:29 +02:00
b291e76572
Use try operator for Option more
2021-06-17 20:37:07 +02:00
f3e630c064
Fix lots of clippy lints
2021-06-17 20:34:14 +02:00
af2ce5803e
Remove pointless double deserialization
2021-06-17 20:29:02 +02:00
7fa54e4411
Use Ruma-provided default power levels for shorter code
2021-06-17 20:14:37 +02:00
f6046871f4
Upgrade Ruma
2021-06-17 20:12:36 +02:00
2ac7b6d411
Merge branch 'event_auth' into 'master'
...
feat: /event_auth
Closes #43
See merge request famedly/conduit!103
2021-06-14 09:44:07 +00:00
67f9592b17
feat: /event_auth
2021-06-14 11:36:40 +02:00
07271b7725
Merge branch 'roomdirfilter' into 'master'
...
improvement: filter our room directory
Closes #35
See merge request famedly/conduit!102
2021-06-14 09:33:20 +00:00
77a23f8969
improvement: filter our room directory
...
Fixes #35
2021-06-14 11:26:41 +02:00
Jonathan de Jong
Timo Kösters
Jonathan de Jong
Jonas Zohren
Kurt Roeckx
Daniel Wiesenberg
Devin Ragotzy
Aiden McClelland
phesch
Jonas Platte