MirrorHub/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-07-04 18:58:34 +02:00
Code Issues Releases Activity
1304 commits 50 branches 6 tags 12 MiB
Commit graph

1304 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonas Platte 92571d961f
Remove mutation from default_config and set default log_level to off 2022-02-03 19:55:54 +01:00
Timo Kösters 7a388f4d72 Merge branch 'command-refactor' into 'next' 
Move and refactor admin commands into admin module

See merge request famedly/conduit!253
 2022-02-03 18:43:54 +00:00
Andrei Vasiliu b56efcdc2a Merge remote-tracking branch 'origin/next' into command-refactor 
Fixed a small conflict in admin.rs
 2022-02-03 20:31:06 +02:00
Andrei Vasiliu 6399a7fe4e Remove dash from admin command help 2022-02-03 20:21:04 +02:00
Timo Kösters 79345dc2a6 Merge branch 'refactor' into 'next' 
Some refactorings

See merge request famedly/conduit!279
 2022-02-03 12:50:55 +00:00
Jonas Platte 974c10e739
Move Config out of database module 2022-02-03 13:30:04 +01:00
Jonas Platte ce60fc6859
Stop using set_env to configure tracing-subscriber 2022-02-03 13:24:28 +01:00
Jonas Platte abb4b4cf0b
Remove TryFrom, TryInto imports 
They are no longer needed in the 2021 edition.
 2022-02-03 13:24:04 +01:00
Andrei Vasiliu 4bbff69a24 Merge remote-tracking branch 'origin/next' into command-refactor 
Fixed conflict with commit 78502aa6b1
 2022-02-03 13:12:55 +02:00
Timo Kösters b4755ba15b Merge branch 'tests' into 'next' 
Bug fixes

See merge request famedly/conduit!278
 2022-02-03 10:12:04 +00:00
Timo Kösters 9ef3abacd4
fix: initial state deserialize->serialize error 2022-02-03 10:57:54 +01:00
Andrei Vasiliu 87225e70c3 Parse admin command body templates from doc comments 2022-02-02 21:35:57 +02:00
Jonas Zohren 510a44699d Merge branch 'fix-healthcheck-no-port' into 'next' 
Docker: Healtcheck and build fixes

Closes #222

See merge request famedly/conduit!277
 2022-02-02 14:07:49 +00:00
Jonas Zohren c4733676cf Apply feedback from Ticho 2022-02-02 13:35:15 +00:00
Jonas Zohren e5bac5e4f5
fix: Running in Docker 2022-02-02 14:07:35 +01:00
Jonas Zohren 9478c75f9d
Use prebuilt CI-containers from https://gitlab.com/jfowl/conduit-containers 
Also run all builds on approved MRs
 2022-02-02 13:31:28 +01:00
Torsten Flammiger e24d75cffc
Return the ID of the appservice that was created by register_appservice 2022-02-02 13:29:10 +01:00
Torsten Flammiger 8f69f02e59
add error handling for register_appservice too 2022-02-02 13:29:09 +01:00
Torsten Flammiger da7b55b39c
Cleanup appservice events after removing the appservice 2022-02-02 13:29:09 +01:00
user bfcf2db497
fix: mention dependencies to build from source 2022-02-02 13:29:09 +01:00
Timo Kösters a5f004d7e9
fix: signature mismatch on odd send_join servers 2022-02-02 13:25:31 +01:00
Jonas Zohren 004dfdeaac Merge branch 'ci-test-using-prebuilt-images' into 'next' 
Use custom container images for CI

Closes #221

See merge request famedly/conduit!273
 2022-02-01 23:51:38 +00:00
Jonas Zohren fa4099b138 Use prebuilt CI-containers from https://gitlab.com/jfowl/conduit-containers 
Also run all builds on approved MRs
 2022-02-01 23:51:38 +00:00
Timo Kösters caf9834e50
feat: cache capacity modifier 2022-02-01 14:42:13 +01:00
Timo Kösters 23aecb78c7
fix: use to_lowercase on /register/available username 2022-01-31 15:40:31 +01:00
Timo Kösters e17bbdd42d
tests 2022-01-31 14:49:00 +01:00
Timo Kösters 95ca43e20f Merge branch 'cleanup_events_after_unregister_appservice' into 'next' 
Cleanup events after unregister appservice / update appservice error handling / return ID of new appservice

See merge request famedly/conduit!276
 2022-01-31 13:24:01 +00:00
Torsten Flammiger 28d3b348d2 Return the ID of the appservice that was created by register_appservice 2022-01-31 11:52:33 +01:00
Torsten Flammiger 78502aa6b1 add error handling for register_appservice too 2022-01-31 10:07:49 +01:00
Torsten Flammiger cc13112592 Cleanup appservice events after removing the appservice 2022-01-31 09:27:31 +01:00
Andrei Vasiliu 677f044d13 Refactor admin code to always defer command processing 2022-01-31 00:00:05 +02:00
Timo Kösters fb2a7ebf66 Merge branch 'build-dependencies-deploy' into 'next' 
Mention dependencies to build from source

See merge request famedly/conduit!275
 2022-01-29 08:35:54 +00:00
user 8ff95a5a48 fix: mention dependencies to build from source 2022-01-28 22:26:56 -08:00
Jonas Zohren 401b88d16d
fix: Healtcheck use netstat for port as fallback 2022-01-28 23:23:58 +01:00
Jonas Zohren 8c1cf733b5 Merge branch 'fix-healthcheck-no-port' into 'next' 
fix: Use default port for healthcheck as fallback

Closes #222

See merge request famedly/conduit!274
 2022-01-28 21:48:25 +00:00
Jonas Zohren 44f7a85077
fix: Use default port for healthcheck as fallback 
Conduit can start without a specific port being configured.
This adjusts the healthcheck script to tolerate that state.

Closes https://gitlab.com/famedly/conduit/-/issues/222
 2022-01-28 22:33:49 +01:00
Jonas Platte 296c68c0cd Merge branch 'get-thumbnail-mxc-as-ref' into 'next' 
Do not copy mxc string unnecessarily in db.get_thumbnail()

See merge request famedly/conduit!272
 2022-01-27 17:14:42 +00:00
Andrej Kacian 529e88c7f9 Do not copy mxc string unnecessarily in db.get_thumbnail() 2022-01-27 17:47:09 +01:00
Timo Kösters 20006c91af Merge branch 'media-download-followup' into 'next' 
Media download followup

See merge request famedly/conduit!271
 2022-01-27 16:24:15 +00:00
Andrej Kacian 0f6d232cb1 Style fixes from 'cargo fmt' 2022-01-27 17:13:33 +01:00
Andrej Kacian ccfc243c2c Make get_remote_content() return Result instead of ConduitResult 2022-01-27 17:13:07 +01:00
Timo Kösters f7148def90 Merge branch 'up-ruma' into 'next' 
Upgrade Ruma

See merge request famedly/conduit!268
 2022-01-27 15:46:00 +00:00
Timo Kösters 63309e52f8 Merge branch 'media-download-with-filename' into 'next' 
Media download with filename

See merge request famedly/conduit!266
 2022-01-27 15:44:56 +00:00
Andrej Kacian c4317a7a96 Reduce code duplication in media download route handlers 2022-01-27 16:32:19 +01:00
Jonas Platte 9c2000cb89
Upgrade Ruma 2022-01-27 16:25:42 +01:00
Andrej Kacian 52873c88b7 Fix incorrect HTTP method in doc comments of two media routes 2022-01-27 00:31:44 +01:00
Andrej Kacian 8472eff277 Implement media download with custom filename 2022-01-27 00:31:44 +01:00
Jonas Zohren ba8d5abb67 Merge branch 'fix/sccache' into 'next' 
Fix CI cargo-cross caching with sccache

See merge request famedly/conduit!264
 2022-01-26 18:54:13 +00:00
Maxim De Clercq ff16729976
fix: correct RUSTC_WRAPPER path in cross container 2022-01-26 00:02:03 +01:00
Maxim De Clercq acf1585fc3
fix: make sure that libatomic is linked statically 2022-01-24 11:45:07 +01:00