Claire
b96c8ecff4
Merge commit '89c1b9a8fdfe38881ad1b6c22f20240b087aa993' into glitch-soc/merge-upstream
2026-01-26 18:09:54 +01:00
Claire
1b748eaeb0
Fix irrelevant accounts being passed through silenced_account_ids to DistributionWorker ( #37589 )
2026-01-26 09:26:19 +00:00
Claire
8b95254883
Merge commit 'c36db57acedf0033c090748125c665a0360cd11f' into glitch-soc/merge-upstream
2026-01-23 17:57:20 +01:00
Matt Jankowski
157d8c0d99
Remove deprecated usage of imagemagick ( #37488 )
2026-01-22 14:57:19 +00:00
Claire
95aaefe083
Merge commit '562ea656f495f0619e393b7d93bd07c5abd28e5a' into glitch-soc/merge-upstream
2026-01-21 22:04:02 +01:00
Matt Jankowski
562ea656f4
Add coverage for TagManager#normalize_domain ( #35994 )
2026-01-21 16:11:38 +00:00
Claire
e7c6600d83
Fix cross-server conversation tracking ( #37559 )
2026-01-21 12:02:41 +00:00
Claire
5d04c56c48
Merge commit '400c1f3e8ec0ffd33ad30d9334b9210cdb89b14c' into glitch-soc/merge-upstream
2026-01-20 16:14:14 +01:00
Claire
028e76f770
Merge commit from fork
...
* Add limit on inbox payload size
The 1MB limit is consistent with the limit we use when fetching remote resources
* Add limit to number of options from federated polls
* Add a limit to the number of federated profile fields
* Add limit on federated username length
* Add hard limits for federated display name and account bio
* Add hard limits for `alsoKnownAs` and `attributionDomains`
* Add hard limit on federated custom emoji shortcode
* Highlight most destructive limits and expand on their reasoning
2026-01-20 15:14:45 +01:00
Claire
841dfce9f7
Merge commit from fork
2026-01-20 15:13:43 +01:00
Claire
e9793971b3
Merge commit 'ad77ee7f8ba6aa25ee36e3e21c38d9bbc252b097' into glitch-soc/merge-upstream
2026-01-19 18:01:57 +01:00
Claire
220115757d
Fix potential duplicate handling of quote accept/reject/delete ( #37537 )
2026-01-19 13:47:27 +00:00
Claire
f65e6a5029
Merge commit '10de65e41c3b01bd938f97fdb60fc96c26673966' into glitch-soc/merge-upstream
2026-01-14 20:31:42 +01:00
Claire
10de65e41c
Fix FeedManager#filter_from_home error when handling a reblog of a deleted status ( #37486 )
2026-01-14 10:51:23 +00:00
David Roetzel
c218849204
Add collection endpoint ( #37468 )
2026-01-14 10:08:29 +00:00
Claire
b4ed1e6c99
Merge commit '19bc3e76ea1d7fa2d9af711613a77fc0f5f0d1b5' into glitch-soc/main
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Upstream added a helper to insert javascript tags, close to where we had
modified code.
Ported upstream's change.
2026-01-13 18:30:48 +01:00
Claire
5b54cd7f76
Add ability to include inline javascript ( #37459 )
2026-01-13 10:40:26 +00:00
Claire
478462ab25
Merge commit 'ed17b3a7ec52c0421ae2483a8e08431316f08b1c' into glitch-soc/merge-upstream
2026-01-12 21:00:14 +01:00
David Roetzel
a9cfddf28e
AP/AS serialization of Collections ( #37434 )
2026-01-12 08:39:25 +00:00
Claire
d7254ecec4
Merge commit 'a4b8b9fe98c677f718e4b2c1ffe1755d58e7f8d7' into glitch-soc/merge-upstream
2026-01-10 13:12:36 +01:00
Joshua Rogers
b35b3a8bcc
Fix arg order for non_matching_uri_hosts? call in QuoteRequest ( #37425 )
2026-01-09 16:21:05 +00:00
Joshua Rogers
48ce49260d
Fix thread-unsafe ActivityPub activity dispatch ( #37423 )
2026-01-09 16:20:59 +00:00
Shlee
f97a015cf9
SharedConnectionPool - NoMethodError: undefined method 'site' for Integer ( #37374 )
2026-01-09 16:20:50 +00:00
Shlee
e0cca5c3ba
Fix SignatureParser accepting duplicate parameters in HTTP Signature header ( #37375 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com >
2026-01-08 10:47:53 +00:00
Essem
5c358ceaf1
Merge pull request #3340 from TheEssem/fix/quote-cw-fallback-md
...
Fix quotes with only CWs not having fallback link when posting with other content types
2026-01-07 21:39:27 +01:00
David Roetzel
aa2110025e
Fix URI generation for reblogs by accounts with numerical AP ids ( #37415 )
2026-01-07 15:39:22 +00:00
Claire
aa6ec435d2
Merge commit '9fe14a30724e18425aedaba59ca63c63d8b14083' into glitch-soc/merge-upstream
2026-01-07 14:53:51 +01:00
Claire
0b1b98c4f2
Merge commit from fork
2026-01-07 14:14:42 +01:00
Claire
b1d219afd0
Merge commit '82fb2596c70a18fc4a2d99ab51106180196bfe98' into glitch-soc/merge-upstream
2026-01-05 18:19:58 +01:00
Claire
82fb2596c7
Fix posts with edited out media attachments being returned in /api/v1/accounts/:id/statuses?only_media=true ( #37363 )
2026-01-05 15:06:20 +00:00
Claire
f711e222dc
Fix quotes with CWs but no text not having fallback link ( #37361 )
2026-01-05 10:35:35 +00:00
Claire
04f4725249
Merge commit '0231b6d350d6027fa822f286732405b573d634e8' into glitch-soc/merge-upstream
2025-12-19 18:43:09 +01:00
David Roetzel
4e63958914
Federated "featureable in collections" preference ( #37298 )
2025-12-19 13:44:27 +00:00
Claire
84feffd6e6
Merge commit '009275e66b55729f754da7b4c814b37b67dc76dc' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/form/admin_settings.rb`:
Upstream added a method right next to glitch-soc-only methods.
Added upstream's method.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream changed a line right next to a glitch-soc addition.
Changed the code as upstream did.
2025-12-17 18:27:14 +01:00
David Roetzel
5e8b8f9c23
Extract interaction policy class ( #37277 )
2025-12-17 10:12:43 +00:00
Claire
db62d70492
Change Wrapstodon switch from feature flag to admin setting ( #37273 )
2025-12-17 09:47:02 +00:00
Claire
780fefa700
Merge commit '53be8392eceea8c3a576478e209fe82c2ceb458a' into glitch-soc/merge-upstream
2025-12-16 18:27:03 +01:00
Claire
550a6d4765
Add wrapstodon to initial state and show wrapstodon sidebar item on load ( #37261 )
2025-12-16 09:47:18 +00:00
Claire
1fdb48c668
Merge commit 'cbe135210305c0ce4455130c4e75680e53ff1425' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/wrapstodon/show.html.haml`:
Conflict caused by glitch-soc's theming system.
Updated upstream changes.
2025-12-15 20:22:20 +01:00
Nicholas La Roux
09ab2829da
Upgrade rubocop-rails from 2.33.4 to 2.34.2 and address related offenses ( #37243 )
2025-12-15 12:57:16 +00:00
David Roetzel
1766616ebc
Refactor relation preloading ( #37217 )
2025-12-15 07:35:46 +00:00
Claire
53617cef5a
Merge commit 'd730f6b0c5cfb18894d1a9e34d0aa2556dda3c62' into glitch-soc/merge-upstream
2025-12-11 18:05:28 +01:00
Claire
addeb28292
Change wrapstodon 2025 to allow unlisted posts in top statuses ( #37206 )
2025-12-11 16:35:35 +00:00
Claire
17ba99e5de
Merge commit 'd6f2a3ac8d61e0828a17f68a6e9094d0f4662f4c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/wrapstodon/show.html.haml`:
Conflict because of glitch-soc's theming change.
Adapted upstream's changes.
- `docker-compose.yml`:
Conflict because of container repo name change.
Adapted upstream's changes.
- `yarn.lock`:
Conflict because of an additional glitch-soc dependency.
Updated the dependencies upstream did.
2025-12-10 18:05:44 +01:00
Claire
7b8a5d42f1
Remove unused time series details from 2025 annual report ( #37187 )
2025-12-10 11:02:24 +00:00
Claire
315f5e5a31
Merge commit '9d81561bb2440c8fb9a75bd05277120aff346b1e' into glitch-soc/merge-upstream
2025-12-09 18:06:56 +01:00
Matt Jankowski
ac71771d98
Fix misc comment typos ( #37183 )
2025-12-09 16:09:01 +00:00
Claire
2f6cdd6d47
Merge commit '1ae3b4672bffbc4aaf26f60c7063d6901239de5d' into glitch-soc/merge-upstream
2025-12-05 20:00:40 +01:00
Echo
007ae588d8
Fix incorrect date for Wrapstodon start ( #37138 )
2025-12-05 14:12:26 +00:00
Claire
9b851616fe
Remove more unused data from 2025 annual reports ( #37134 )
2025-12-05 13:36:37 +00:00
