Claire
f800057008
Merge commit 'b8444d9bb7885d75112a3cae74b6a5c711c7d547' into glitch-soc/merge-upstream
2025-10-08 18:07:04 +02:00
Claire
0be0a8898a
Fix Update/Delete of quoted status not being forwarded to quoters's followers ( #36390 )
2025-10-08 12:56:32 +00:00
Renaud Chaput
e8dab026bb
Fix quote mailer preview to use the latest quote notification ( #36373 )
2025-10-07 10:19:53 +00:00
Claire
73a625c284
Merge commit '4dc21d7afdb485402555908bc72d071f8b25ec36' into glitch-soc/merge-upstream
...
Conflicts:
- `config/settings.yml`:
Upstream replaced a setting with 4 new ones, while glitch-soc had modified
the default value of that setting.
Removed the old setting and added the new settings, but with defaults
matching glitch-soc's previous behavior.
2025-10-06 19:24:16 +02:00
Claire
2d2c525097
Split timeline_preview setting into more granular settings ( #36338 )
2025-10-06 08:34:05 +00:00
Claire
17e0c745c6
Merge commit 'f69ca085dbfca2253404574dcdc4dc6c2aaa35c0' into glitch-soc/merge-upstream
2025-10-01 19:13:18 +02:00
Claire
cbb94bdfde
Merge commit '45219dbf64805746a472e50bb7c9bcb52972ab2a' into glitch-soc/merge-upstream
2025-09-30 18:06:45 +02:00
Claire
5af40ff960
Fix some routes for numeric AP identifiers ( #36304 )
2025-09-30 15:09:59 +00:00
Claire
589af7a1cc
Change GET /api/v1/statuses/:id/quotes to allow listing quotes to other people's posts ( #36291 )
2025-09-30 09:56:03 +00:00
Claire
45219dbf64
Fix spurious notification of local boosters and quoters when updating quote policy ( #36299 )
2025-09-30 09:40:58 +00:00
Emelia Smith
5b97f25a15
Add integration tests for mastodon-streaming ( #36025 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com >
Co-authored-by: David Roetzel <david@roetzel.de >
2025-09-30 07:27:09 +00:00
Claire
b6c53c1129
Merge commit '150f0fcba5585782e2cac49d971904f02d5e6fbd' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/follower_accounts_controller.rb`:
Upstream refactored a part of the code where glitch-soc has changed the code
to potentially hide followers count.
Adapt upstream's changes.
2025-09-29 18:41:46 +02:00
Claire
150f0fcba5
Add support for numeric-based URIs for local accounts ( #32724 )
2025-09-29 12:05:48 +00:00
Claire
106b0a9d93
Merge commit 'a44a3f6d4047568921469ff9fbd212f553b1e7f4' into glitch-soc/merge-upstream
2025-09-27 21:46:57 +02:00
Claire
a44a3f6d40
Expand test coverage of ActivityPub::TagManager class ( #36260 )
2025-09-26 10:00:53 +00:00
Claire
b15b07606c
Merge commit '28be5a199f685b9fb26742c4d78ddca53df05d57' into glitch-soc/merge-upstream
2025-09-24 18:26:13 +02:00
Claire
28be5a199f
Fix Private Messages self-quoting private posts being changed to followers-only ( #36249 )
2025-09-24 10:58:52 +00:00
Claire
e1f7847b64
Remove the outgoing_quotes feature flag, making the feature unconditional ( #36130 )
2025-09-24 08:58:08 +00:00
Claire
880e662a60
Merge commit '854aaec6fe69df02e6d850cb90eef37032b4d72f' into glitch-soc/merge-upstream
2025-09-19 18:18:56 +02:00
Matt Jankowski
854aaec6fe
Spec for newline in request lib initialize ( #36170 )
2025-09-19 15:22:23 +00:00
Claire
b6bc42aaa6
Fix getting Create and Update out of order ( #36176 )
2025-09-19 08:45:13 +00:00
Claire
16e479e3ec
Merge commit '90765342a35abd6883e57f5419342f491b83e250' into glitch-soc/merge-upstream
2025-09-17 21:46:08 +02:00
Claire
90765342a3
Fix posts when omitting quote policy and default policy is nobody ( #36158 )
2025-09-17 19:16:36 +00:00
Claire
3a31ef11cc
Merge commit 'db0cd9489c70e985da961a585f3a809ca449dccf' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/post_status_service.rb`:
Upstream updated the logic to move the CW to the text content.
Glitch-soc does not move CW to text content but has some logic
to avoid the text being empty. Update the logic according to upstream's
change.
- `docker-compose.yml`:
Conflict because of different paths for composer images.
Updated version as upstream did while keeping our path.
2025-09-17 20:10:28 +02:00
Claire
210786efd8
Merge commit '2664bb628b7bf77b9efa4143423486cf16d17ba7' into glitch-soc/merge-upstream
2025-09-17 18:17:18 +02:00
Claire
fbf093a87f
Fix CW being moved to text when posting quote posts with empty text ( #36151 )
2025-09-17 12:19:00 +00:00
Jeong Arm
3055afd1d2
Fix applying user's default quote policy if API parameter is not specified ( #36132 )
2025-09-17 07:08:55 +00:00
Claire
5da295fa4d
Merge commit '06803422da3794538cd9cd5c7ccd61a0694ef921' into glitch-soc/merge-upstream
2025-09-13 11:12:22 +02:00
Claire
82b26603fe
Fix quote posts with CW and no text being rejected ( #36095 )
2025-09-12 13:10:31 +00:00
Claire
128a69c1f4
Merge commit '75f78244d5df52cc8242b6a7c6b8d1531963aa63' into glitch-soc/merge-upstream
2025-09-11 12:13:47 +02:00
Claire
b60ee191ac
Fix QuoteAuthorization id not being properly serialized when federating revocation ( #36083 )
2025-09-11 09:37:56 +00:00
Claire
06f45a2046
Merge commit 'eb118d85238da8d0583868abab2756bb329742ba' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Upstream updated dependencies textually adjacent to glitch-soc-only ones.
Updated them as upstream did.
2025-09-10 18:11:12 +02:00
Yamagishi Kazutoshi
ffaa672fd6
Display Valkey version on admin dashboard ( #35785 )
2025-09-10 10:58:51 +00:00
Claire
e1dc960219
Rework FEP-7888 implementation ( #36064 )
2025-09-09 18:27:30 +00:00
Jesse Karmani
65b4a0a6f1
Implement FEP 7888: Part 1 - publish conversation context ( #35959 )
2025-09-05 19:28:29 +00:00
Claire
6fc9febb47
Merge commit '1b664cf20dbb696cf16a42efcf59ab186cb211eb' into glitch-soc/merge-upstream
2025-09-05 20:03:42 +02:00
Matt Jankowski
1b664cf20d
Relay reset delivery tracker model spec and callback ( #36027 )
2025-09-05 12:56:15 +00:00
Matt Jankowski
05a655f33e
Convert age verification controller to system specs ( #36026 )
2025-09-05 12:44:09 +00:00
Matt Jankowski
3efba15b3c
Use pluck on DomainAllow.allowed_domains for export ( #36019 )
2025-09-05 12:30:18 +00:00
Emelia Smith
4c2a2c27c1
Automatically remove invalid Web::PushSubscriptions ( #35987 )
2025-09-04 08:00:44 +00:00
Claire
d5b959a2ca
Merge commit '75fca715e9ae8ad347edbaf6511a052f161a3de3' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
Upstream moved some preferences to a new category, while glitch-soc had an
extra preference there.
Moved the extra preference like upstream did to the new category.
2025-09-02 19:07:51 +02:00
Claire
75fca715e9
Change public self-quotes of private posts to be disallowed ( #35975 )
2025-09-02 15:48:37 +00:00
fiona
e665cc68f4
Fix handling of edited status with new media and no text ( #35970 )
2025-09-02 12:25:55 +00:00
Eugen Rochko
7fc884ba00
Fix banned text being able to be circumvented via unicode ( #35978 )
2025-09-02 07:29:03 +00:00
Claire
ab698ff521
Move posting defaults to their own preferences sub-category ( #35966 )
2025-09-01 08:31:07 +00:00
Claire
6abe6cdef5
Merge commit '40242fafee83cf9a6bcb2d0ac1e228827969402f' into glitch-soc/merge-upstream
2025-08-29 18:21:28 +02:00
Matt Jankowski
ee4b0a223c
Add coverage for Relay model ( #35950 )
2025-08-29 15:18:52 +00:00
Claire
4fa203e69e
Rename unknown quote policy value to unsupported_policy ( #35955 )
2025-08-29 13:50:37 +00:00
Matt Jankowski
5f1e6a5886
Fix failure to verify changes in api/v1/accounts/credentials spec ( #35951 )
2025-08-29 08:14:23 +00:00
Claire
884d7996b1
Merge commit '02de05dc272856c77fac5c9e1d84cf585ae20c1e' into glitch-soc/merge-upstream
2025-08-27 18:13:03 +02:00
