Claire
eeffe580d8
Merge commit '74fc4dbacf5a9168074e91fc2d75309dc42ff1ed' into glitch-soc/merge-upstream
2025-07-15 18:19:32 +02:00
Claire
594976a538
Refactor ActivityPub::Activity::Accept and ActivityPub::Activity::Reject specs ( #35382 )
2025-07-15 13:18:37 +00:00
Claire
1716f8da71
Merge commit '3b52dca4057560c58b260433722d91650fcd5040' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream added a `features` attribute where glitch-soc had extra ones.
Added `features` like upstream did.
2025-07-11 18:53:47 +02:00
Matt Jankowski
f9beecb343
Improve Accounts CLI prune spec ( #35302 )
2025-07-10 07:23:09 +00:00
Claire
3efc857fbc
Merge commit '8ee6cee36e313fcc39763210dfcd3b871b47cacb' into glitch-soc/merge-upstream
2025-07-08 16:41:01 +02:00
David Roetzel
1fa72d6c44
Raise better exception on FASP error responses ( #35262 )
2025-07-04 07:25:42 +00:00
Claire
2eec4da8fc
Merge commit 'c357a7f8d697ede4df4be74456b0497118c9d049' into glitch-soc/merge-upstream
2025-06-30 17:52:22 +02:00
David Roetzel
c357a7f8d6
Add optional bulk mailer settings ( #35203 )
2025-06-30 14:49:14 +00:00
Claire
f7b4580b49
Merge commit '0d650780e26735621f08bbdd545b162871e4562c' into glitch-soc/merge-upstream
...
Conflicts:
- `.prettierignore`:
Upstream added a file, glitch-soc had extra files.
Took upstream's changes and moved glitch-soc's additions at the end.
2025-06-26 18:04:37 +02:00
David Roetzel
48451b782d
Move email env var reading to yml files ( #35191 )
2025-06-26 12:18:30 +00:00
Claire
2e0a00ab46
Fix search operators sometimes getting lost ( #35190 )
2025-06-26 10:35:49 +00:00
Claire
7da6b07c75
Merge commit '71d4ce1c228bab470fa9d3bcb5a130cf53665103' into glitch-soc/merge-upstream
2025-06-13 18:07:59 +02:00
Matt Jankowski
ab7f50ce4e
Reduce hard coding of LOCAL_DOMAIN env value throughout tests ( #35025 )
2025-06-13 07:58:22 +00:00
Claire
aa6d1d4ac1
Merge commit '629bb74451242060298c6fb305c5337002379cc2' into glitch-soc/merge-upstream
2025-06-11 18:55:03 +02:00
Claire
7a7e0ba4cd
Add basic support for remote attachments with multiple media types ( #34996 )
2025-06-10 13:26:29 +00:00
Matt Jankowski
dc2cfd50a0
Fix Style/OptionalBooleanParameter cop ( #34968 )
2025-06-10 08:17:35 +00:00
Claire
564d74ea36
Merge commit 'd887790e86124493df850e9bc52e1e059207b523' into glitch-soc/merge-upstream
2025-06-06 18:16:52 +02:00
Claire
d0c6f30378
Add fasp queue to sidekiq queue system check ( #34965 )
2025-06-06 15:23:16 +00:00
Claire
4b22aa93a2
Merge commit '989ca63b596c9006c5606edd4e66498e29e83489' into glitch-soc/merge-upstream
2025-06-06 12:56:00 +02:00
Claire
989ca63b59
Remove inbound_quotes feature flag ( #34958 )
2025-06-06 08:25:59 +00:00
Claire
86627624f1
Fix quote post streaming edge cases ( #34957 )
2025-06-06 07:32:24 +00:00
Claire
088af860b3
Merge commit '9c80b16401e7606cbd7eb2bf3af32c18953d1d3f' into glitch-soc/merge-upstream
2025-06-02 12:16:06 +02:00
Claire
00b56932de
Fix handling of featured tag removal ( #34887 )
2025-06-02 08:09:30 +00:00
Claire
8e409f92fe
Merge commit '32b521b7f4055ccd4e59587589c2bed7759537cb' into glitch-soc/merge-upstream
2025-05-31 17:32:57 +02:00
Claire
32b521b7f4
Fix multiple issues in quoted posts hydration ( #34864 )
2025-05-31 15:20:31 +00:00
Claire
086a7016c4
Merge commit 'd78535eab9cefc285c0d7ef88adb125ab1ceb6bd' into glitch-soc/merge-upstream
...
Conflicts:
- `vite.config.mts`:
Upstream moved its theming system to a plug-in, where we had our own.
Adapted the file as well as our own plugin to adopt the same mechanisms.
2025-05-27 20:49:19 +02:00
Matt Jankowski
37c82a3003
Update sidekiq to version 7 ( #34745 )
2025-05-26 15:32:41 +00:00
Claire
b031f65670
Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream
2025-05-25 14:51:59 +02:00
Claire
6d6263ce07
Drop redis namespace code (except for Rails cache) ( #34665 )
2025-05-20 13:02:09 +00:00
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
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
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
Matt Jankowski
6463415e06
Update rubocop-rspec to version 3.6.0 ( #34497 )
2025-04-24 14:56:13 +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
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
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
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
