Claire
e53421b548
Merge commit 'e5826777b6c06a32b97388657beaca1e5eccb421' into glitch-soc/merge-upstream
...
Conflicts:
- `config/settings.yml`:
Not a real conflict, upstream removed settings that are identical in glitch-soc
but textually adjacent to glitch-soc-only settings.
Removed what upstream removed.
2025-07-30 20:05:45 +02:00
Claire
e5826777b6
Fix friends-of-friends recommendations suggesting already-requested accounts ( #35604 )
2025-07-30 16:28:26 +00:00
Claire
31ba52a57b
Change StatusReachFinder to consider quotes as well as reblogs ( #35601 )
2025-07-30 14:07:01 +00:00
Matt Jankowski
e8e6cf9510
Add coverage to user spec for missing last_sign_in_at scenario ( #35587 )
2025-07-30 13:46:58 +00:00
Matt Jankowski
3146109b08
Add MediaAttachment.combined_media_file_size method ( #35570 )
2025-07-30 12:57:51 +00:00
Matt Jankowski
8896d6c1b1
Use attribute for User#bypass_registration_checks? ( #35580 )
2025-07-30 12:55:36 +00:00
Matt Jankowski
7e6b134222
Extract User::Activity concern ( #35581 )
2025-07-30 11:19:11 +00:00
Matt Jankowski
4042bc959b
Use increment for User#update_sign_in! optional change ( #35573 )
2025-07-30 10:38:04 +00:00
Matt Jankowski
6dc55a2f4e
Extract User::Confirmation concern ( #35582 )
2025-07-30 10:33:57 +00:00
Matt Jankowski
15b72591d4
Use attribute for User#external? ( #35579 )
2025-07-30 09:48:18 +00:00
Eugen Rochko
20bbd20ef1
Add ability to block words in usernames ( #35407 )
2025-07-29 10:19:15 +00:00
Eugen Rochko
8cf7a77808
Fix async refresh never being finished when status cannot be fetched ( #35500 )
2025-07-29 09:23:32 +00:00
Matt Jankowski
040a638ab9
Fix Style/GuardClause in Tag ( #35522 )
2025-07-28 08:54:29 +00:00
Matt Jankowski
eb73ae2f86
Fix Style/GuardClause in User#regenerate_feed! ( #35523 )
2025-07-28 08:53:52 +00:00
Matt Jankowski
916cc1365e
Fix Style/GuardClause in User#wrap_email_confirmation ( #35524 )
2025-07-28 08:52:59 +00:00
Matt Jankowski
63daf6b317
Fix Style/GuardClause in PreviewCard ( #35525 )
2025-07-28 08:40:37 +00:00
Matt Jankowski
7cd3738c19
Add with_list_account scope to List model ( #35539 )
2025-07-28 08:26:29 +00:00
Eugen Rochko
018e5e303f
Fix jobs being added to batch after they might already execute ( #35496 )
2025-07-28 08:20:12 +00:00
Matt Jankowski
73f72ec8fe
Use attribute for defining rate_limit boolean ( #35555 )
2025-07-28 08:08:31 +00:00
Matt Jankowski
b464b87c2b
Use moved? query method where relevant ( #35542 )
2025-07-28 08:02:21 +00:00
Matt Jankowski
9d0d6f011c
Add coverage for AnnouncementReaction model ( #35543 )
2025-07-28 07:59:32 +00:00
Claire
8649681c51
Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/activitypub/note_serializer.rb`:
Conflict because upstream added context extensions where glitch-soc had its own.
Added upstream's new context extension while keeping ours.
2025-07-25 21:45:00 +02:00
Claire
5a88b7f683
Add experimental basic quote post authoring ( #35355 )
2025-07-25 12:35:24 +00:00
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
