Claire
9fccf0a8c6
Merge commit '6166e616389b051039dc76635048e2519271832a' into glitch-soc/merge-upstream
2025-06-24 20:45:46 +02:00
Matt Jankowski
fd902c04f7
Use config_for for omniauth enabled values ( #35015 )
2025-06-24 09:32:13 +00:00
Matt Jankowski
c023ebc87a
Limit count to pending&trending on admin/trends/tags page ( #35120 )
2025-06-23 13:30:12 +00:00
Matt Jankowski
8837fd8c54
Update rubocop to version 1.77.0 ( #35128 )
2025-06-23 07:40:11 +00:00
Claire
9cb5a77c3e
Merge commit 'ac039d5f1323c46062d004896996f50549bfa38b' into glitch-soc/merge-upstream
2025-06-21 22:59:04 +02:00
David Roetzel
adf812efb3
Fix missing terms of services link ( #35115 )
2025-06-21 08:59:47 +00:00
Claire
f8f458e5e6
Merge commit '0ec6c26af3d7dc9a0eeb5631ebb9f56b724aaa8e' into glitch-soc/merge-upstream
2025-06-20 12:01:02 +02:00
David Roetzel
0ec6c26af3
Fix error when RFC9421 signatures are used ( #35109 )
2025-06-20 09:44:26 +00:00
Claire
2c751a6a19
Merge commit 'c644413f8a068490ddb8038441e5b59112e8294e' into glitch-soc/merge-upstream
2025-06-16 20:08:52 +02:00
David Roetzel
b2506478ba
Add FASP follow recommendation support ( #34964 )
2025-06-16 10:43:27 +00:00
Matt Jankowski
6f2aba989f
Move "limited federation mode" config to x.mastodon area ( #35041 )
2025-06-16 06:13:03 +00:00
Claire
7da6b07c75
Merge commit '71d4ce1c228bab470fa9d3bcb5a130cf53665103' into glitch-soc/merge-upstream
2025-06-13 18:07:59 +02:00
David Roetzel
83d5016ca3
Re-instate rescuing signature errors ( #35033 )
2025-06-13 13:36:33 +00:00
Claire
80af1ea434
Merge commit '825312d4b0587c0da5575f8eaabe038438746cd3' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Conflict because of different theming system.
Adapted upstream's changes.
- `vite.config.mts`:
Conflict because of different theming system.
Adapted upstream's changes.
2025-06-12 20:32:25 +02:00
Claire
220b78d4a9
Merge commit '2254f47702368938bdfd0d997f2487fb2950d676' into glitch-soc/merge-upstream
2025-06-12 17:39:03 +02:00
David Roetzel
319fbbbfac
Experimental Async Refreshes API ( #34918 )
2025-06-12 14:54:00 +00:00
Eugen Rochko
24d943fee0
Change media attachments in moderated posts to not be accessible ( #34872 )
2025-06-12 08:53:02 +00:00
Claire
2085b0b53a
Merge commit '520974e05211e988b0447f7f29e88798b1794bcf' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/rest/status_serializer.rb`:
Not a real conflict, just glitch-soc code textually adjacent to code added
upstream.
2025-06-05 18:02:40 +02:00
Matt Jankowski
1297ad759e
Update rubocop to version 1.76.0 ( #34926 )
2025-06-05 12:09:05 +00:00
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
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
Emelia Smith
a73ade526a
Assert usage of client credentials for account registration ( #34828 )
2025-05-28 12:09:32 +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
David Roetzel
3acd87419c
Update to linzer 0.7 ( #34765 )
2025-05-23 06:43:02 +00:00
Claire
8c51a8ba94
Add ability to translate server rules ( #34494 )
2025-05-21 11:54:12 +00:00
Claire
f94b1fce41
Drop compatibility with Redis < 6.2 ( #30413 )
2025-05-20 12:55:42 +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
David Roetzel
a5a2c6dc7e
Add support for FASP data sharing ( #34415 )
2025-05-16 12:24:02 +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
Claire
a5a3a781e0
Merge commit '82688387a8d19906371a6dd4af64e5b662031603' into glitch-soc/merge-upstream
2025-05-09 18:16:46 +02:00
Claire
912268295c
Change /api/v2/instance to be enabled without authentication when limited federation mode is enabled ( #34576 )
2025-05-09 07:46:57 +00:00
Claire
3ec3814f8e
Merge commit '715cbee93d419e26cf952bf7fc70f9c1cc217d8b' into glitch-soc/merge-upstream
2025-05-03 17:37:26 +02: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
Claire
d4944a2467
Fix incorrect redirect in response to unauthenticated API requests in limited federation mode ( #34549 )
2025-04-25 11:24:57 +00:00
Claire
22ec828951
Change DEFAULT_LOCALE to not override unauthenticated users' browser language ( #34535 )
2025-04-24 11:38:27 +00:00
Claire
8cbd99e645
Merge commit 'a324edabdfc19b6978ed31800b92e36022006cd5' into glitch-soc/merge-upstream
2025-04-21 14:32:47 +02: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
Claire
4b491674b2
Merge commit '887336f2c66b6ac5049d10bf5f27fa69a15e0745' into glitch-soc/merge-upstream
2025-04-08 19:12:28 +02:00
Claire
36afb4557a
Fix incorrect deprecation warning for DELETE /api/v1/suggestions/:id ( #34397 )
2025-04-08 14:32:17 +00:00
Claire
99e3ea232f
Merge commit '5f87ae101c5e0e940e148d493eaac1ce31fe24c1' into glitch-soc/merge-upstream
2025-04-04 20:00:24 +02:00
David Roetzel
e2ef173b82
Refactoring: Move SignatureVerificationError into Mastodon namespace ( #34342 )
2025-04-02 07:54:29 +00:00
