Claire
72affd6b45
Merge commit 'a863e68d174b176dc350d8e3472c010cd37b7807' into glitch-soc/merge-upstream
...
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.
- `docker-compose.yml`:
Conflict because of upstream VS glitch-soc repos.
Updated version number as upstream did, but kept glitch-soc repos.
2025-07-24 18:10:38 +02:00
Claire
a863e68d17
Add restrictions on which quote posts can trend ( #35507 )
2025-07-24 15:45:12 +00:00
Claire
63af7ecb1f
Merge commit '7d3ef27a8dc8fb281bae959b245d3db63aa82260' into glitch-soc/merge-upstream
2025-07-23 18:43:56 +02:00
Eugen Rochko
14a781fa24
Add button to load new replies in web UI ( #35210 )
2025-07-23 13:42:07 +00:00
Matt Jankowski
70058ae49d
Add Form::BaseBatch class for "batch form update" objects ( #35458 )
2025-07-23 07:50:35 +00:00
Claire
eeffe580d8
Merge commit '74fc4dbacf5a9168074e91fc2d75309dc42ff1ed' into glitch-soc/merge-upstream
2025-07-15 18:19:32 +02:00
Matt Jankowski
0efb889a9c
Extract constant for attribution domains limit in account ( #35350 )
2025-07-15 13:08:24 +00:00
Claire
c0eabe289b
Always give local quote of remote posts a quote request URI ( #35383 )
2025-07-15 13:01:03 +00:00
Matt Jankowski
30344d6abf
Confirm User#login_activities in auth/sessions spec ( #35372 )
2025-07-15 06:31:00 +00:00
Matt Jankowski
1637297085
Add coverage for CustomFilterStatus model ( #35374 )
2025-07-15 06:28:40 +00:00
Matt Jankowski
dec1fb71f4
Add coverage for FollowRecommendationMute model ( #35376 )
2025-07-15 06:27:36 +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
Claire
88b0f3a172
Simplify DatabaseViewRecord.refresh ( #35252 )
2025-07-11 08:36:05 +00:00
Matt Jankowski
c442589593
Use ActiveModel::Attributes in FollowLimitable concern ( #35327 )
2025-07-10 07:40:56 +00:00
Matt Jankowski
1496488771
Add Status#not_replying_to_account scope for annual report classes ( #35257 )
2025-07-10 07:35:04 +00:00
Matt Jankowski
4ecfbd3920
Add Status.only_polls (and without polls) scope ( #35330 )
2025-07-10 07:13:22 +00:00
Claire
e2a867507c
Merge commit 'e9170e2de1d75e02f04ad39f2af131c70189fb50' into glitch-soc/merge-upstream
2025-07-10 01:10:32 +02:00
Matt Jankowski
fb6c22f5c2
Use touch to record viewing annual report ( #35296 )
2025-07-09 08:04:00 +00:00
Matt Jankowski
f7259f625f
Prefer on: :update in Tag validation declaration ( #35297 )
2025-07-09 08:03:39 +00:00
Claire
f7d1d73073
Merge commit 'b628a98d323902cdcc08fb8d612887dff4dbcd89' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream added a new user setting, directly next to a glitch-soc-only one.
The upstream setting would actually replace the glitch-soc one but it is not
fully implemented yet, so have them side by side now.
- `app/views/settings/preferences/appearance/show.html.haml`:
Ditto.
- `docker-compose.yml`:
Conflict due to different registry names. Updated the version while keeping
glitch-soc's registry.
2025-07-08 17:27:19 +02:00
Claire
3efc857fbc
Merge commit '8ee6cee36e313fcc39763210dfcd3b871b47cacb' into glitch-soc/merge-upstream
2025-07-08 16:41:01 +02:00
Echo
ef66d8379c
Add option to set emoji preferences behind feature flag ( #35282 )
2025-07-08 10:51:11 +00:00
Matt Jankowski
bdffdcb12f
Remove unused scopes in Account model ( #35276 )
2025-07-07 08:07:01 +00:00
Matt Jankowski
2af17adc34
Use ActiveModel::Attributes in admin/status_batch_action ( #35255 )
2025-07-03 14:43:36 +00:00
Claire
e97f43399b
Fix error handling for blank actions in account moderation action form ( #35246 )
2025-07-03 14:42:48 +00:00
Matt Jankowski
6e39b5ef04
Use ActiveModel::Attributes for admin/account_action boolean values ( #35247 )
2025-07-03 07:28:07 +00:00
Matt Jankowski
49db8a9662
Use Account#targeted_reports association where needed ( #35249 )
2025-07-03 07:28:03 +00: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
