Claire
c475623418
Merge commit 'dc6d8f882528803c06b2a71c23d6c1467880a7e1' into glitch-soc/merge-4.4
2025-09-23 18:10:55 +02:00
Claire
70e2eb49df
Add support for has:quote in search ( #36217 )
2025-09-23 14:33:16 +02:00
Claire
19c89f1bbd
Merge commit 'c966d756007e0e4c4eb020055c999e4cf7a07ed0' into glitch-soc/merge-4.4
2025-09-16 14:14:05 +02:00
Claire
48f55e3224
Fix quote posts with CW and no text being rejected
...
Fixes #36077
2025-09-12 16:27:29 +02:00
Claire
00c61317d3
Merge remote-tracking branch 'upstream/stable-4.4' into HEAD
...
Conflicts:
- `app/views/layouts/application.html.haml`:
Conflict because of glitch-soc's theming system.
Updated the line as upstream did.
2025-09-04 18:33:21 +02:00
Emelia Smith
1137a0ca3a
Support displaying polls in Admin UI ( #35933 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com >
2025-09-04 10:45:54 +02:00
Claire
ea5d1f0297
Fix tootctl admin create not bypassing reserved username checks ( #35779 )
2025-09-04 10:45:54 +02:00
Emelia Smith
cbb9a4dbe3
Refactor to reuse the one status partial across moderation tools ( #35644 )
2025-09-04 10:45:54 +02:00
Claire
fcb7917344
Merge commit '208cb8276ae618aa36aec5fad0dc31341402c133' into glitch-soc/merge-4.4
...
Conflicts:
- `app/models/trends/statuses.rb`:
Conflict because of glitch-soc's setting to allow CWs in trends.
Kept glitch-soc's setting but followed upstream's refactor.
2025-08-04 21:48:37 +02:00
Claire
208cb8276a
Fix friends-of-friends recommendations suggesting already-requested accounts ( #35604 )
2025-08-01 11:34:27 +02:00
Claire
4ae47f4263
Change StatusReachFinder to consider quotes as well as reblogs ( #35601 )
2025-08-01 11:34:27 +02:00
Claire
8242f06eca
Add restrictions on which quote posts can trend ( #35507 )
2025-08-01 11:34:27 +02:00
Claire
e69c1479a8
Merge commit '77d2cdb30230ae6292bd247f6c6f97d00bd38084' into glitch-soc/backports-4.4
2025-07-23 18:10:05 +02:00
Claire
ee83f3a8b9
Always give local quote of remote posts a quote request URI ( #35383 )
2025-07-23 16:08:43 +02:00
Claire
bd442485d0
Merge commit '333a17a478f0ddcee4115a50f01077cb1dc5c22e' into glitch-soc/merge-4.4
2025-07-08 13:13:07 +02:00
Matt Jankowski
b4a950c2fc
Remove unused scopes in Account model ( #35276 )
2025-07-07 17:48:13 +02:00
Claire
385dd5ea37
Merge commit '0c5ce23ae496af26b96aaab742800af93f552f44' into glitch-soc/merge-4.4
2025-07-04 17:56:10 +02:00
Matt Jankowski
28373a9c88
Use ActiveModel::Attributes in admin/status_batch_action ( #35255 )
2025-07-04 15:10:17 +02:00
Claire
42884d8727
Fix error handling for blank actions in account moderation action form ( #35246 )
2025-07-04 15:10:17 +02:00
Matt Jankowski
878e1e65eb
Use ActiveModel::Attributes for admin/account_action boolean values ( #35247 )
2025-07-04 15:10:17 +02:00
Matt Jankowski
06f5f270cc
Use Account#targeted_reports association where needed ( #35249 )
2025-07-04 15:10:17 +02:00
Claire
2eec4da8fc
Merge commit 'c357a7f8d697ede4df4be74456b0497118c9d049' into glitch-soc/merge-upstream
2025-06-30 17:52:22 +02:00
David Roetzel
bae258925c
Persist follow recommendations from FASP ( #35218 )
2025-06-30 13:39:36 +00:00
Matt Jankowski
964916c71b
Add coverage for TermsOfService scopes/validations ( #35204 )
2025-06-30 10:28:14 +00:00
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
