Claire
5321a553d5
Merge commit 'aa04efb92a47cf27c1aafb2aeb21584e91c526ac' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Not a real conflict, upstream added a setting on a line adjacent to a
glitch-soc-only line.
Added upstream's new setting.
2025-05-14 13:38:23 +02:00
Claire
aa04efb92a
Move server rule creation form to its own page ( #34637 )
2025-05-14 09:43:07 +00:00
Jonny Saunders
b709ef8ac3
Add: Update root status when fetching replies ( #34615 )
2025-05-12 14:54:58 +00:00
Claire
4e2aa78a56
Fix tootctl accounts create failing because of date-of-birth check ( #34663 )
2025-05-12 09:28:12 +00:00
Claire
8d98d91f33
Merge commit '22e2e7f02b2f25f30abd6a616bc3b0b543b30279' into glitch-soc/merge-upstream
2025-05-06 12:06:51 +02:00
Claire
22e2e7f02b
Fix crash when likes or shares collections are not inlined, for real ( #34619 )
2025-05-06 09:51:42 +00:00
Claire
3e5d78cc5b
Fix crash when likes or shares collections are not inlined ( #34618 )
2025-05-06 07:39:26 +00:00
Claire
d14d7a5379
Merge commit 'aedc5f692144aa36245fe47c277bb5ad4766a335' into glitch-soc/merge-upstream
2025-05-05 20:31:48 +02:00
Claire
cbaba54e9d
Add support for importing embedded self-quotes ( #34584 )
2025-05-05 08:01:16 +00:00
Claire
3ec3814f8e
Merge commit '715cbee93d419e26cf952bf7fc70f9c1cc217d8b' into glitch-soc/merge-upstream
2025-05-03 17:37:26 +02:00
Eugen Rochko
715cbee93d
Fix dashboard warning about Elasticsearch index mismatch not showing up ( #34567 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2025-04-28 13:59:49 +00:00
Claire
9ed6a14d45
Add support for ingesting quote policies ( #34479 )
2025-04-28 08:48:27 +00:00
Claire
ae3b7dd28d
Reject incoming QuoteRequest activities ( #34480 )
2025-04-25 23:28:09 +00:00
Claire
dae6f19490
Merge commit '7a70d9543525681b5c408cfd17782843da13177f' into glitch-soc/merge-upstream
2025-04-25 17:22:10 +02:00
Eugen Rochko
a97647158c
Add REST API for featuring and unfeaturing a hashtag ( #34489 )
...
Co-authored-by: Matt Jankowski <matt@jankowski.online>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2025-04-25 15:12:05 +00:00
Matt Jankowski
6463415e06
Update rubocop-rspec to version 3.6.0 ( #34497 )
2025-04-24 14:56:13 +00:00
Claire
7bc301e184
Make Web::PushSubscription#user and Web::PushSubscription#access_token relationships non-optional ( #34498 )
...
Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
2025-04-23 08:12:31 +00:00
Claire
dee744c793
Fix quote serializer ( #34510 )
2025-04-23 07:29:13 +00:00
Claire
5e679f41f9
Merge commit 'e097f0e9eb76514efc405f3d1cef0692ff4cff35' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
glitch-soc-specific dependency too close to a dependency updated upstream.
Updated dependencies as upstream did.
2025-04-22 19:55:29 +02:00
Matt Jankowski
8dea1c422a
Combine examples to reduce factories in BulkImportWorker spec ( #34499 )
2025-04-22 08:23:41 +00:00
Claire
3628717595
Merge commit '3159f3b2f6ed444d4f247c5e7864e4c41ca285df' into glitch-soc/merge-upstream
2025-04-21 15:47:21 +02:00
Claire
ace0a3d61f
Merge commit 'b33f9ea60338a78dde2fb7fe3f083c2ffaafcf1f' into glitch-soc/merge-upstream
2025-04-21 15:22:22 +02:00
Claire
8cbd99e645
Merge commit 'a324edabdfc19b6978ed31800b92e36022006cd5' into glitch-soc/merge-upstream
2025-04-21 14:32:47 +02:00
Claire
8489f6c8fc
Fix namespace of QuoteAuthorization type in specs ( #34481 )
2025-04-17 09:19:23 +00:00
Claire
df2611a10f
Add initial support for ingesting and verifying remote quote posts ( #34370 )
2025-04-17 07:45:23 +00:00
Eugen Rochko
ff0990ec9f
Add REST API for fetching an account's endorsed accounts ( #34421 )
2025-04-16 05:39:20 +00:00
Matt Jankowski
2eaef09166
Use enum validation instead of ArgumentError rescue for List replies policy check ( #34452 )
2025-04-14 21:11:10 +00:00
Matt Jankowski
aadff24099
Enable validate: true on CustomFilter#action ( #34434 )
2025-04-14 07:28:11 +00:00
Claire
4e6c7fba78
Merge commit '678c8dfeec2c221cf609b924161dc03cebfa41e1' into glitch-soc/merge-upstream
2025-04-10 17:50:04 +02:00
Matt Jankowski
de19af3650
Extract frontend_translations helper to support module ( #34400 )
2025-04-10 13:51:17 +00:00
Matt Jankowski
4c2f64907b
Remove deprecated Import model ( #34371 )
2025-04-10 12:49:24 +00:00
Matt Jankowski
6deadd596d
Remove deprecated single-argument variation of UnfilterNotificationsWorker ( #33353 )
2025-04-09 13:42:57 +00:00
Claire
99e3ea232f
Merge commit '5f87ae101c5e0e940e148d493eaac1ce31fe24c1' into glitch-soc/merge-upstream
2025-04-04 20:00:24 +02:00
Claire
dd23ba9c83
Refactor local-URI-to-account resolving ( #34349 )
2025-04-02 14:44:09 +00:00
Matt Jankowski
d315a90db7
Convert settings/pictures spec controller->request ( #34340 )
2025-04-02 12:58:47 +00:00
Matt Jankowski
501ced4239
Add coverage for extra attributes scenario in Admin::Trends::StatusesHelper#one_line_preview method ( #34353 )
2025-04-02 12:52:54 +00:00
David Roetzel
e2ef173b82
Refactoring: Move SignatureVerificationError into Mastodon namespace ( #34342 )
2025-04-02 07:54:29 +00:00
Claire
f8b0f38636
Merge commit '902aab1245a06319b7acd20045bd9ce051627300' into glitch-soc/merge-upstream
2025-03-29 17:02:39 +01:00
Claire
a5eaa95bb2
Merge commit 'e28b64ac2dcd381f8b7e6bcfc2cc2b2ed3121cd9' into glitch-soc/merge-upstream
2025-03-28 18:48:04 +01:00
David Roetzel
97b9994743
Basic FASP support ( #34031 )
2025-03-28 12:16:40 +00:00
Matt Jankowski
dfa4a97dd8
Fix intermittent account note failure by removing disappearing content check ( #34296 )
2025-03-28 09:24:36 +00:00
Claire
c2defe0e4c
Change account suspensions to be federated to recently-followed accounts as well ( #34294 )
2025-03-28 09:20:32 +00:00
Matt Jankowski
0479efdbb6
Fix intermittent failure on account note system spec ( #34295 )
2025-03-27 15:09:09 +00:00
Matt Jankowski
ef879a532f
Convert activitypub/* controller specs to request specs ( #33992 )
2025-03-27 14:55:13 +00:00
Matt Jankowski
445aa4ac72
Convert activitypub/inboxes spec controller->request ( #34292 )
2025-03-27 13:52:48 +00:00
Claire
449dc30739
Merge commit 'c43508b3e0b05c5e739d726bad53f1eef89e9376' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/content_security_policy.rb`:
Upstream added support for `EXTRA_MEDIA_HOSTS` which is very similar to
glitch-soc's `EXTRA_DATA_HOST`.
Deprecate `EXTRA_DATA_HOST` FOR `EXTRA_MEDIA_HOST`.
2025-03-26 19:14:26 +01:00
Claire
9c5c86c947
Merge commit 'c93b2c6809905d24262b5973efe20832f1b04a6d' into glitch-soc/merge-upstream
2025-03-26 18:18:07 +01:00
David Roetzel
02db065571
Use fixed order in flaky spec ( #34279 )
2025-03-26 13:26:24 +00:00
Claire
59e189ad3c
Add support for paginating partial collections in SynchronizeFollowersService ( #34277 )
2025-03-26 11:33:59 +00:00
Matt Jankowski
2a181f56e3
Convert settings/deletes spec controller->request/system ( #34274 )
2025-03-26 07:26:28 +00:00
