mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-10-18 13:35:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity
24036 commits 5 branches 144 tags 246 MiB
Commit graph

3364 commits

Author SHA1 Message Date
Jeremy Kescher d364a1b0a7
Merge branch 'upstream-main' into develop 2024-10-11 00:53:18 +02:00
Jeremy Kescher 9090719153
Merge remote-tracking branch 'refs/remotes/upstream/stable-4.3' into develop 2024-10-10 22:57:13 +02:00
Claire 94c69bba25 Merge branch 'stable-4.3' into glitch-soc/backports-4.3 2024-10-08 13:19:29 +02:00
Matt Jankowski fc5b558b32 Reduce factory usage across spec/services area (#32098) 2024-10-08 10:44:32 +02:00
Claire 7e06d724c9 Merge commit '4238da6ee3c93dfd5752e9133cbec958f8ebb18a' into glitch-soc/merge-upstream 2024-10-07 20:45:07 +02:00
Claire 4a859140ec Merge commit 'edcf3d9234b03d6b1c4b29d1d15339f7f64040fb' into glitch-soc/backports-4.3 2024-10-07 20:03:53 +02:00
Leni Kadali 4238da6ee3
Add error message when user tries to follow their own account (#31910) 2024-10-07 12:05:46 +00:00
Matt Jankowski 25de2f57ee Add coverage for missing status scenario in NotificationMailer (#32256) 2024-10-07 10:54:23 +02:00
Claire b28ce2424c Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream renamed a constant that was used slightly differently in glitch-soc.
  Renamed it as upstream did.
 2024-10-06 16:07:58 +02:00
Claire dfe851b476 Merge branch 'stable-4.3' into glitch-soc/backports-4.3 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
 2024-10-05 20:45:05 +02:00
Matt Jankowski aa46348c03 Enable hostname config for all system specs (#32109) 2024-10-04 17:48:03 +02:00
Matt Jankowski ceba0f082e Provide use_path to qr generator for svg data size reduction (#32127) 2024-10-04 17:48:03 +02:00
Matt Jankowski 7de8d5ffca Add relevant_params to ReportFilter (matches account filter) (#32136) 2024-10-04 17:48:03 +02:00
Matt Jankowski f07707a9bb Extract WebPushRequest from push notification worker and subscription (#32208) 2024-10-04 17:48:03 +02:00
Matt Jankowski 243a85ec8d Expand coverage for Export utility class (#32212) 2024-10-04 17:48:03 +02:00
Christian Schmidt cbf1349370 Support /.well-known/host-meta.json (#32206) 2024-10-04 17:48:03 +02:00
Jeong Arm b8fdffe824 Ignore error if mentioned account was not processable (#29215) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-04 17:48:03 +02:00
David Roetzel ce2481a81b Move OTP secret length to configuration (#32125) 2024-10-04 17:48:03 +02:00
Matt Jankowski ebdeac0731
Add coverage for missing status scenario in NotificationMailer (#32256) 2024-10-04 14:15:14 +00:00
Matt Jankowski e4e07b1c34
Reduce factory usage across spec/services area (#32098) 2024-10-04 14:11:15 +00:00
Matt Jankowski 463f9197d8
Add regression coverage for admin reports resolution button within form (#32248) 2024-10-04 12:21:55 +00:00
Jeremy Kescher 1290a5609d
Merge branch 'glitch-v4.3.0-rc.1' into develop 2024-10-03 22:25:40 +02:00
Matt Jankowski cc8d723e71
Register an XML encoder for response tests (#32220) 2024-10-03 13:10:27 +00:00
Matt Jankowski d95f6f4410
Extract ExportSummary class for account object counts (#32227) 2024-10-03 13:09:58 +00:00
Matt Jankowski b7bb850efd
Enable hostname config for all system specs (#32109) 2024-10-02 13:56:26 +00:00
Matt Jankowski d270d6dd4f
Provide use_path to qr generator for svg data size reduction (#32127) 2024-10-02 13:26:46 +00:00
Matt Jankowski 2151dfb8d6
Add relevant_params to ReportFilter (matches account filter) (#32136) 2024-10-02 13:24:40 +00:00
Matt Jankowski 4aa26eba53
Extract WebPushRequest from push notification worker and subscription (#32208) 2024-10-02 11:11:52 +00:00
Matt Jankowski ebab3b80c7
Expand coverage for Export utility class (#32212) 2024-10-02 09:43:04 +00:00
Christian Schmidt 33d3ca7cf1
Support /.well-known/host-meta.json (#32206) 2024-10-02 09:23:44 +00:00
Jeong Arm 66b2bc1c84
Ignore error if mentioned account was not processable (#29215) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-02 08:08:02 +00:00
David Roetzel e6cda8388c
Move OTP secret length to configuration (#32125) 2024-10-01 09:38:42 +00:00
Claire 7ef25ae53b Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream 2024-09-29 11:06:09 +02:00
Matt Jankowski cdd7526531
Remove completed TODO note in tags request spec (#32108) 2024-09-27 08:22:40 +00:00
Claire 513f187daf
Add “A Mastodon update is available.” message on admin dashboard for non-bugfix updates (#32106) 2024-09-26 19:27:57 +00:00
Matt Jankowski db57fe80c8
Remove page_json var from ap/replies spec (#32000) 2024-09-26 08:54:01 +00:00
Claire 633165ba9c Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-soc/merge-upstream 2024-09-25 17:41:37 +02:00
Renaud Chaput 28966fa0a6
Remove deprecated v2_alpha endpoint for grouped notifications (#32089) 2024-09-25 15:21:11 +00:00
Matt Jankowski 51777fe3e2
Prefer structure checks over multi-line size/parts checks in parsed_body (#32063) 2024-09-25 13:54:22 +00:00
Renaud Chaput 3dc4ddc663
Fix search params being dropped when redirected to non-deck path (#31984) 2024-09-25 13:35:37 +00:00
Matt Jankowski 83574f641a
Add coverage and use mailer callback to check functional user in notification mailer (#32055) 2024-09-25 08:07:48 +00:00
Matt Jankowski c2ef83ea4c
Consolidate shared a scope example parts into one attributes check (#32046) 2024-09-25 07:56:42 +00:00
Matt Jankowski c3b6a7a297
Reduce factory creation (36 -> 12) in spec/controllers/oauth/* area (#32045) 2024-09-25 07:56:08 +00:00
Matt Jankowski 06ecf9008b
Remove single-use shared examples in controller specs (#32044) 2024-09-25 07:50:15 +00:00
Claire c6039f99ce Merge commit '70988519df66f0b8edeb6ca95140f1d3e436fea8' into glitch-soc/merge-upstream 2024-09-24 19:34:30 +02:00
André Menrath 556837f156
Fix the summary of converted object types to be treated as HTML (#28629) 2024-09-24 15:57:53 +00:00
Claire c36a76b9eb
Fix error when accepting appeal for sensitive posts deleted in the meantime (#32037) 
Co-authored-by: David Roetzel <david@roetzel.de>
 2024-09-24 15:19:55 +00:00
Matt Jankowski 780e2e9d66
Convert notification mailer spec shared examples to matchers (#32047) 2024-09-24 12:07:16 +00:00
Claire c2c3a66478 Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream 2024-09-23 20:24:18 +02:00
Matt Jankowski 5dfdec6453
Convert settings/applications controller spec to system/request specs (#32006) 2024-09-23 13:37:32 +00:00