Claire
53185f5381
Merge commit '081d38679f965ac20ff1a6c72e2fc1108c34ac30' into glitch-soc/merge-upstream
2025-08-04 21:24:47 +02:00
Eugen Rochko
c8ec649830
Fix "new replies available" miscounting previously known replies ( #35654 )
2025-08-04 12:49:17 +00:00
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
Eugen Rochko
2257612deb
Fix "new replies available" reporting a false positive for re-fetched root status ( #35602 )
2025-07-30 16:09:16 +00:00
Eugen Rochko
a368b29e27
Fix number of new replies increasing even if reply was not fetched ( #35577 )
2025-07-29 10:47:18 +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
ea976a5ffb
Fix unnecessary account note addition for already-muted moved-to users ( #35566 )
2025-07-29 08:23:19 +00:00
Matt Jankowski
8d6f033326
Fix Style/GuardClause in move worker ( #35520 )
2025-07-28 12:55:05 +00:00
Matt Jankowski
86ef4d4884
Add skip_* methods to check move worker process ( #35538 )
2025-07-28 08:50:19 +00:00
Matt Jankowski
5d69157e62
Prefer delegated nil-wrapping methods to safe navigation ( #35541 )
2025-07-28 08:03:23 +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
Matt Jankowski
e5e977c24f
Fix Style/GuardClause in worker rescues ( #35508 )
2025-07-25 07:18:46 +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
Claire
2eec4da8fc
Merge commit 'c357a7f8d697ede4df4be74456b0497118c9d049' into glitch-soc/merge-upstream
2025-06-30 17:52:22 +02:00
David Roetzel
c357a7f8d6
Add optional bulk mailer settings ( #35203 )
2025-06-30 14:49:14 +00:00
David Roetzel
bae258925c
Persist follow recommendations from FASP ( #35218 )
2025-06-30 13:39:36 +00:00
David Roetzel
ac4b735c67
Add FASP account search support ( #34033 )
2025-06-30 07:42:34 +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
Eugen Rochko
1be48d0cab
Change terms of service e-mail job to be iterable ( #35126 )
2025-06-24 07:41:39 +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
Claire
aa6d1d4ac1
Merge commit '629bb74451242060298c6fb305c5337002379cc2' into glitch-soc/merge-upstream
2025-06-11 18:55:03 +02:00
Matt Jankowski
dc2cfd50a0
Fix Style/OptionalBooleanParameter cop ( #34968 )
2025-06-10 08:17:35 +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
086a7016c4
Merge commit 'd78535eab9cefc285c0d7ef88adb125ab1ceb6bd' into glitch-soc/merge-upstream
...
Conflicts:
- `vite.config.mts`:
Upstream moved its theming system to a plug-in, where we had our own.
Adapted the file as well as our own plugin to adopt the same mechanisms.
2025-05-27 20:49:19 +02:00
Matt Jankowski
37c82a3003
Update sidekiq to version 7 ( #34745 )
2025-05-26 15:32:41 +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
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
304c0417ed
Fix handling of inlined featured collections in ActivityPub actor objects ( #34789 )
2025-05-23 15:01:07 +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
3ea1f074ab
Fix sidekiq JSON serialization warning in ActivityPub::FetchAllRepliesWorker ( #34702 )
2025-05-16 09:07:33 +00:00
Claire
7cc3d85a72
Merge commit '1b68020331783c365cd5baa696945d0d8bc68f72' into glitch-soc/merge-upstream
2025-05-14 18:44:04 +02:00
Claire
e8e93b82f1
Fix NoMethodError in ActivityPub::FetchAllRepliesWorker ( #34682 )
2025-05-14 13:43:34 +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
Jonny Saunders
b709ef8ac3
Add: Update root status when fetching replies ( #34615 )
2025-05-12 14:54:58 +00:00
Claire
ace0a3d61f
Merge commit 'b33f9ea60338a78dde2fb7fe3f083c2ffaafcf1f' into glitch-soc/merge-upstream
2025-04-21 15:22:22 +02:00
Claire
df2611a10f
Add initial support for ingesting and verifying remote quote posts ( #34370 )
2025-04-17 07:45:23 +00:00
Claire
4e6c7fba78
Merge commit '678c8dfeec2c221cf609b924161dc03cebfa41e1' into glitch-soc/merge-upstream
2025-04-10 17:50:04 +02:00
Matt Jankowski
4c2f64907b
Remove deprecated Import model ( #34371 )
2025-04-10 12:49:24 +00:00
Matt Jankowski
6deadd596d
Remove deprecated single-argument variation of UnfilterNotificationsWorker ( #33353 )
2025-04-09 13:42:57 +00:00
Claire
166514d252
Merge commit 'aa575341c2da1e84d349ca0b42211b0da30a2254' into glitch-soc/merge-upstream
2025-03-27 19:40:04 +01:00
Matt Jankowski
0e3ff680d3
Update rubocop to version 1.75.0 ( #34283 )
2025-03-27 07:48:19 +00:00
Claire
b330cc21c4
Merge commit 'aff51823752b809c3349698b6be02bfdda7a9010' into glitch-soc/merge-upstream
2025-03-12 19:48:51 +01:00
Claire
a704e1991c
Further refactor reply fetching code ( #34151 )
2025-03-12 14:52:10 +00:00
Claire
966b816382
Refactor ActivityPub::FetchRepliesService and ActivityPub::FetchAllRepliesService ( #34149 )
2025-03-12 11:52:38 +00:00
