Claire
c9a1e27a49
Merge commit 'dbb20f76a781defe35d077529c8269d712c1fbd2' into glitch-soc/merge-upstream
...
Conflicts:
- `tsconfig.json`:
glitch-soc had extra paths under `app/javascript/flavours`, but upstream
added `app/javascript` as a whole, so updated to upstream's.
2025-06-25 19:29:09 +02:00
Claire
392eaf1010
Ensure consistent ordering of rule translations in admin interface ( #35174 )
2025-06-25 13:15:59 +00:00
Claire
0a7418e6d8
Change rule translation interface to display english name and populate empty translations ( #35170 )
2025-06-25 10:02:19 +00:00
Emelia Smith
72f2f35bfb
Implement Instance Moderation Notes ( #31529 )
2025-06-25 08:15:44 +00:00
Matt Jankowski
f852da50f6
Add User#email_domain method to extract domain from email address ( #35159 )
2025-06-25 07:22:19 +00:00
Claire
93bdb16817
Merge commit '8ba1487f30685fff4555a7537d3e6c765c73a07c' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/models/concerns/account/interactions_spec.rb`:
Conflict due to glitch-soc having modified specs ages ago.
The covered code is the same as upstream, though.
Took upstream's version of the specs.
- `spec/models/status_spec.rb`:
Conflict because glitch-soc tests for an extra glitch-soc-specific
method.
Added upstream's changes while keeping the glitch-soc method.
2025-06-24 22:43:43 +02:00
Matt Jankowski
0338733531
Add model coverage and scopes to RuleTranslation class ( #35098 )
2025-06-24 07:44:50 +00:00
Matt Jankowski
36f01af6c4
Add Status#only_reblogs scope for annual report classes ( #35141 )
2025-06-24 06:54:55 +00:00
Matt Jankowski
b08ccaa5b3
Extract Account::Mappings concern from "interactions" ( #35119 )
2025-06-23 12:02:14 +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
Matt Jankowski
54f9a1b43b
Extract secret size constants in Webhook model ( #35104 )
2025-06-20 10:05:24 +00:00
Matt Jankowski
e9b1c1edfe
Simplify WebauthnCredential constant limit math ( #35107 )
2025-06-20 10:04:14 +00:00
Claire
2c751a6a19
Merge commit 'c644413f8a068490ddb8038441e5b59112e8294e' into glitch-soc/merge-upstream
2025-06-16 20:08:52 +02:00
Claire
c644413f8a
Fix database error instead of form validation on ToS effective date conflict ( #35053 )
2025-06-16 13:44:48 +00:00
David Roetzel
b2506478ba
Add FASP follow recommendation support ( #34964 )
2025-06-16 10:43:27 +00:00
Claire
7da6b07c75
Merge commit '71d4ce1c228bab470fa9d3bcb5a130cf53665103' into glitch-soc/merge-upstream
2025-06-13 18:07:59 +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
564d74ea36
Merge commit 'd887790e86124493df850e9bc52e1e059207b523' into glitch-soc/merge-upstream
2025-06-06 18:16:52 +02:00
Matt Jankowski
d887790e86
Update SafeReblogInsert concern to match Rails 8 method ( #34966 )
2025-06-06 15:25:09 +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
Claire
3d474807bf
Change “legacy” non-fast-tracked quote posts to not be displayed as such ( #34945 )
2025-06-05 13:53:57 +00:00
Matt Jankowski
1297ad759e
Update rubocop to version 1.76.0 ( #34926 )
2025-06-05 12:09:05 +00:00
Claire
06b1f8bd85
Merge commit '8224178e8ca9746f97ce341179d2c636fa22a082' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/trends/statuses.rb`:
Upstream added a condition where glitch-soc had changes on the same line.
Adapted upstream's changes.
2025-06-02 20:05:43 +02:00
Claire
d4bbe8b719
Fix blocked accounts not being automatically removed from trending statuses ( #34891 )
2025-06-02 13:38:47 +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
c00e27aa55
Merge commit '54ad57ea9527a58ac2b95159ed178ed7c737a89c' into glitch-soc/merge-upstream
2025-05-30 17:41:31 +02:00
Matt Jankowski
c025824f98
Use config_for for cache buster values ( #34851 )
2025-05-30 11:54:25 +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
David Roetzel
b195956ecb
Encapsulate redis key usage ( #34840 )
2025-05-28 12:34:37 +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
Matt Jankowski
8d4ae81ab4
Remove OTP_SECRET env configuration ( #34748 )
2025-05-22 09:33:21 +00:00
Claire
6ab96ba647
Use more generic locale as fallback for rules ( #34756 )
2025-05-21 16:22:54 +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
d7cb6068b1
Add ability to reorder server rules from admin interface ( #34737 )
2025-05-20 12:49:11 +00:00
Echo
dbf14784bf
Add setting to control the referrer origin ( #34731 )
2025-05-19 13:13:22 +00:00
Claire
90f7b90223
Change passthrough video processing to emit moov atom at start of video ( #34726 )
2025-05-19 08:29:31 +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
5305e939c4
Add (currently unused) setting for default quote policy ( #34623 )
2025-05-13 11:47:38 +00:00
Marcel Hellkamp
c9a554bdca
fix: OIDC account creation fails for long display names ( #34639 )
2025-05-12 15:51:53 +00:00
Claire
4e2aa78a56
Fix tootctl accounts create failing because of date-of-birth check ( #34663 )
2025-05-12 09:28:12 +00:00
