faa283d35b
review feedback
2021-07-19 13:44:53 +02:00
3ce75d1f02
apply fix
2021-07-19 11:55:39 +02:00
a50abeedad
Merge branch 'ci-rough-sytest-integration' into 'master'
...
CI: Add sytest
See merge request famedly/conduit!130
2021-07-19 08:47:32 +00:00
130b9841da
CI: Add sytest
2021-07-19 08:47:31 +00:00
ffa10a68b9
Merge branch 'more-detailed-issue-templates' into 'master'
...
Docs: More (detailed) templates for Issues and MRs
See merge request famedly/conduit!129
2021-07-19 08:28:10 +00:00
124b5484b5
Merge branch 'test-registering-with-element-web' into 'master'
...
CI: Test registration with element web
See merge request famedly/conduit!128
2021-07-19 08:23:05 +00:00
2babff1e41
CI: Test registration with element web
2021-07-19 08:23:04 +00:00
cdd01262d2
Shorten more templates
2021-07-18 20:43:21 +00:00
092221ca3f
Reduce amount of text in Bug Report template
2021-07-18 20:30:57 +00:00
5d8ad4fd72
Add some more details to the MR template
2021-07-17 12:22:11 +02:00
7054f74783
Add issue template for GitHub which redirects to Gitlab
2021-07-17 12:21:41 +02:00
82a4ec9cbd
Add more detailed issue templates
...
Shamelessly stolen from
https://github.com/HedgeDoc/client
Originally written by
https://github.com/ErikMichelson and
https://github.com/DerMolly
2021-07-17 12:00:38 +02:00
f924ebf8a6
Merge branch 'fix-windows-signal' into 'master'
...
fix signal compiling on windows
See merge request famedly/conduit!126
2021-07-15 16:29:47 +00:00
b1993421c2
fix signal compiling on windows
2021-07-15 18:09:10 +02:00
8e2d6f7e43
Merge branch 'sled-fix' into 'master'
...
Sled fixes
See merge request famedly/conduit!125
2021-07-15 15:38:40 +00:00
d76e95e8fc
use existing db cache size
2021-07-15 13:47:21 +02:00
661101c9ae
add sled cache_capacity back
2021-07-15 13:29:08 +02:00
f7ecf83ac3
Merge branch 'stuff' into 'master'
...
fix: stuck/duplicate messages, e2ee and sync timeouts
See merge request famedly/conduit!123
2021-07-15 08:18:56 +00:00
9a4789efdc
Merge branch 'ci-format-check-before-cargo-test' into 'master'
...
CI: Check format before running test
See merge request famedly/conduit!124
2021-07-14 20:53:10 +00:00
eaa4c77641
CI: Check format before running test
...
Testing needs compilation and is slow. Format checking is quick.
As format checking fails more often than tests,
switching them should result in faster failure and feedback
2021-07-14 20:33:19 +00:00
9268b33c3f
Merge branch 'shutdown-sync' into 'master'
...
Make shutdown short-circuit sync helpers
See merge request famedly/conduit!122
2021-07-14 13:49:00 +00:00
9de32ae12f
fix toolchain
2021-07-14 15:46:30 +02:00
952fb75795
add shutdown handler to kick sync
2021-07-14 14:50:07 +02:00
e12b1ff863
improvement: locks
2021-07-14 13:21:25 +02:00
e15e6d4405
improvement: efficient /sync, mutex for federation transactions
2021-07-14 13:20:39 +02:00
1c25492a7e
fix: stuck messages
...
Conduit did not send the event in /sync because of a race condition.
There is a brief moment in time where Conduit accepted the event, but
did not store it yet. So when the client /syncs it updates the since
token without sending the event. I hope I fixed it by significantly
shortening the race-condition period.
2021-07-14 13:19:24 +02:00
8c44312485
fix: e2ee verification
2021-07-14 13:10:56 +02:00
ac0027756e
improvement: more efficient state res
2021-07-14 13:10:49 +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
Jonathan de Jong
Timo Kösters
Jonas Zohren
Jonas Zohren
Jonathan de Jong
Kurt Roeckx
Daniel Wiesenberg