Claire
088af860b3
Merge commit '9c80b16401e7606cbd7eb2bf3af32c18953d1d3f' into glitch-soc/merge-upstream
2025-06-02 12:16:06 +02:00
David Roetzel
9c80b16401
Accept HTTP Message Signatures (RFC9421) ( #34814 )
2025-06-02 09:27:08 +00: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
c00e27aa55
Merge commit '54ad57ea9527a58ac2b95159ed178ed7c737a89c' into glitch-soc/merge-upstream
2025-05-30 17:41:31 +02:00
Claire
4b39bced3e
Increase capybara default timeout to reduce test flakiness ( #34859 )
2025-05-30 13:13:24 +00:00
Matt Jankowski
c025824f98
Use config_for for cache buster values ( #34851 )
2025-05-30 11:54:25 +00:00
Matt Jankowski
f7a3dd0e38
Use config_for for VAPID key storage ( #34845 )
2025-05-30 07:00:33 +00:00
Claire
b627aee45f
Merge commit 'ca41a95872545502dbc6bae6f7237ee20acc38ee' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/helpers/theme_helper_spec.rb`:
Conflict due to glitch-soc's different theming system.
Adapted upstream changes to glitch-soc's theming system.
2025-05-28 18:41:47 +02:00
Matt Jankowski
38e0a360ca
Add coverage for "default" stylesheet theme helper path ( #34732 )
2025-05-28 13:33:07 +00:00
David Roetzel
b195956ecb
Encapsulate redis key usage ( #34840 )
2025-05-28 12:34:37 +00:00
Emelia Smith
a73ade526a
Assert usage of client credentials for account registration ( #34828 )
2025-05-28 12:09:32 +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
706c8bf1a0
Merge commit 'a13756148d353c7479f68e65a210f6d88d26c785' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/embedded.html.haml`:
Upstream made a change to javascript tags next to lines changed in glitch-soc
because of the theming system.
Added the javascript entrypoint upstream added.
- `app/views/layouts/error.html.haml`:
Upstream made a change to javascript tags next to lines changed in glitch-soc
because of the theming system.
Added the javascript entrypoint upstream added.
2025-05-25 15:11:58 +02:00
Claire
b031f65670
Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream
2025-05-25 14:51:59 +02:00
Claire
f622686397
Merge commit '90f7b90223ce3212a2bb9746a119bcc9287b3237' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Upstream updated dependencies, including one textually adjacent to a
glitch-soc-only dependency.
Updated dependencies as upstream did.
2025-05-25 14:38:25 +02:00
Claire
f49940db85
Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream
...
Too many conflicts to list, because of webpack → vite migration.
2025-05-25 14:36:51 +02:00
Claire
304c0417ed
Fix handling of inlined featured collections in ActivityPub actor objects ( #34789 )
2025-05-23 15:01:07 +00:00
David Roetzel
3acd87419c
Update to linzer 0.7 ( #34765 )
2025-05-23 06:43:02 +00:00
Claire
6ab96ba647
Use more generic locale as fallback for rules ( #34756 )
2025-05-21 16:22:54 +00:00
Matt Jankowski
f1a6f4333a
Remove redis-namespace gem ( #34742 )
2025-05-21 15:20:17 +00:00
Claire
8c51a8ba94
Add ability to translate server rules ( #34494 )
2025-05-21 11:54:12 +00:00
Matt Jankowski
4709121f72
Remove Legacy OTP Secret code ( #34743 )
2025-05-20 14:51:19 +00:00
Claire
6d6263ce07
Drop redis namespace code (except for Rails cache) ( #34665 )
2025-05-20 13:02:09 +00:00
Claire
d7cb6068b1
Add ability to reorder server rules from admin interface ( #34737 )
2025-05-20 12:49:11 +00:00
Claire
c327451300
Merge commit 'a5a2c6dc7ec0d8af53594cd53a90da7d6fbefd5a' into glitch-soc/merge-upstream
2025-05-16 17:36:28 +02:00
Claire
8cc5084ca1
Add interstitial for Terms of Service updates ( #34527 )
2025-05-16 14:03:05 +00:00
Echo
c4f47adb49
Convert from Webpack to Vite ( #34450 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com >
2025-05-16 13:26:12 +00:00
David Roetzel
a5a2c6dc7e
Add support for FASP data sharing ( #34415 )
2025-05-16 12:24:02 +00:00
Claire
3ea1f074ab
Fix sidekiq JSON serialization warning in ActivityPub::FetchAllRepliesWorker ( #34702 )
2025-05-16 09:07:33 +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
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
