David Roetzel
3e1127d27b
Federate Add when item is added to Collection ( #37823 )
2026-02-11 13:52:29 +00:00
Claire
4fbd1ad7ae
Merge commit 'd13d7b4566d551d027830f7dfc987ba3a8e2dd4f' into glitch-soc/merge-upstream
...
Conflicts are too numerous to list, but they are all caused by upstream's
theming changes and all have to do with the differences between upstream and
glitch-soc in the theming systems.
They were all manually resolved by adapting the relevant code.
2026-02-11 13:32:18 +01:00
Claire
63aac77b61
Purge custom emojis on domain suspension ( #37808 )
2026-02-10 16:13:06 +00:00
Claire
040555be7f
Fix NoMethodError in ActivityPub::FetchFeaturedTagsCollectionService ( #37806 )
2026-02-10 15:24:54 +00:00
David Roetzel
ae30c40335
Auto accept account added to collection ( #37805 )
2026-02-10 12:48:28 +00:00
Claire
1b00b92772
Merge commit '2774e0fbfa045e883ec94e873e657e9e8fefa98b' into glitch-soc/merge-upstream
2026-02-10 12:03:53 +01:00
David Roetzel
03f73377d9
Federate updates to collections ( #37790 )
2026-02-10 10:08:55 +00:00
Claire
c8db60f8d2
Merge commit '0b8ce7200aa3121d07aa3866ddfc99de3bcf319e' into glitch-soc/merge-upstream
2026-02-09 21:45:21 +01:00
Jonny Saunders
e17bbed88f
Change: Consolidate collection handling in jsonld helper ( #34595 )
2026-02-09 15:19:36 +00:00
Claire
8f58c42ca3
Merge commit '2e30044a374811bc94fd62a8159cb2c9ffe18a4d' into glitch-soc/merge-upstream
2026-02-06 22:45:55 +01:00
Claire
5b24f4097d
Fix processing of object updates with duplicate hashtags ( #37756 )
2026-02-06 10:09:42 +00:00
Claire
55cd5e1ab1
Merge commit 'acdd0b33a3183569a2cdb50befdbba58f1e74ae9' into glitch-soc/merge-upstream
2026-02-05 17:57:46 +01:00
Shlee
ecdc7ff3f9
Add defensive check to AfterUnallowDomainService ( #37744 )
...
Co-authored-by: Your Name <you@example.com>
2026-02-05 14:13:56 +00:00
Claire
59e02a628d
Merge commit 'f652c54c3334890176331f62150559a96eeb41ae' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/backup_service.rb`:
Upstream refactored activity serialization while glitch-soc passed an extra argument.
Followed upstream's refactor, keeping our extra argument.
2026-02-05 12:43:12 +01:00
David Roetzel
9cd94168b3
Federate Remove when collection is deleted ( #37741 )
2026-02-05 10:33:39 +00:00
David Roetzel
73206856c5
Refactor activity serialization ( #37678 )
2026-02-05 09:39:27 +00:00
Claire
d62a7775b5
Merge commit 'd0502ac3c1630e281fda5492cbc28390262b0aeb' into glitch-soc/merge-upstream
2026-01-29 21:08:46 +01:00
Matt Jankowski
23148dc536
Update rubocop to version 1.8.40 ( #37628 )
2026-01-29 10:14:14 +00:00
Claire
36be9bbebf
Merge commit 'a495a0cbfcf9f6111c0e598af0864de2b76e4111' into glitch-soc/merge-upstream
2026-01-28 19:29:10 +01:00
Claire
6af4696c70
Add backend support for storing remote actors profile pic and header descriptions ( #37634 )
2026-01-28 09:32:59 +00:00
Claire
b14cbb3ee9
Merge pull request #3364 from ClearlyClaire/glitch-soc/features/local-only-drop-emoji
...
Deprecate eye emoji in favor of a bespoke API parameter
2026-01-27 22:30:17 +01:00
Claire
5a45a3203a
Merge commit '7af5ba271d6f04831f000e9b815914375e42abeb' into glitch-soc/merge-upstream
2026-01-27 18:03:27 +01:00
Claire
7af5ba271d
Fix error when encountering invalid tag in updated object ( #37635 )
2026-01-27 16:01:22 +00:00
David Roetzel
1d4c2c5670
Federate creation of collections ( #37618 )
2026-01-27 10:52:54 +00:00
Claire
73fc40993b
Fix filtering of mentions from filtered-on-their-origin-server accounts ( #37583 )
2026-01-27 09:53:21 +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
9b6500f74a
Skip tombstone creation on deleting from 404 ( #37533 )
2026-01-19 10:36:58 +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
e33a8d5bfb
Merge commit '9b5986b36e86d50d19b68b10788b3316012894c3' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
Upstream refactored a bit where we had an extra argument for markdown/HTML.
Adapted upstream change.
2026-01-13 18:01:53 +01:00
Shlee
c6be114cef
Non-ActivityPub Link header alternate blocks HTML ActivityPub discovery in FetchResourceService ( #37439 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2026-01-13 15:47:48 +00:00
Claire
9332f48abe
Simplify status batch removal SQL query ( #37469 )
2026-01-13 10:18:26 +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
780fefa700
Merge commit '53be8392eceea8c3a576478e209fe82c2ceb458a' into glitch-soc/merge-upstream
2025-12-16 18:27:03 +01:00
Claire
0801104729
Fix mentions of domain-blocked users being processed ( #37257 )
2025-12-16 08:49:48 +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
David Roetzel
a3fa441e0c
Check "featureable" policy on creation of collections ( #37254 )
2025-12-15 15:29:28 +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
David Roetzel
adf8a3601d
Add service to add item to a collection ( #37192 )
2025-12-10 16:59:21 +00:00
Claire
c8f365fd1d
Merge commit '0dac31dfd588e4cd866f382ed001a9535f06234a' into glitch-soc/merge-upstream
2025-12-04 20:59:54 +01:00
David Roetzel
5a7a4fff11
First draft of Collection update API ( #37110 )
2025-12-04 10:00:21 +00:00
Claire
44e6abe48b
Merge commit '0004ed4c8021ebd400d32eb32a5e479ebd7bcf91' into glitch-soc/merge-upstream
2025-11-30 16:40:18 +01:00
Matt Jankowski
199376a080
Use existing time format string to generate backup archive filename ( #36469 )
2025-11-27 09:38:27 +00:00
David Roetzel
322a4fee53
First steps towards a collection creation service ( #37020 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2025-11-27 09:36:44 +00:00
Claire
b76530a7f1
Merge commit '76d8ac3fe680e92d20059c590ccb1cd8f74078c2' into glitch-soc/merge-upstream
2025-11-24 19:08:03 +01:00
Matt Jankowski
f1bf6e6344
Remove unused from_limited? method from NotifyService ( #36988 )
2025-11-24 07:57:46 +00:00
