Claire
2ebf6d60a6
Merge commit 'e89acc2302df49cbd7815b031e9c2939632bd204' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Conflict because of an extra dependency in glitch-soc.
Updated upstream's dependencies as upstream did.
2026-01-03 16:05:35 +01:00
Claire
bc3f68b46a
Fix date-related wrapstodon test failures ( #37362 )
2026-01-02 10:52:22 +00:00
Claire
04f4725249
Merge commit '0231b6d350d6027fa822f286732405b573d634e8' into glitch-soc/merge-upstream
2025-12-19 18:43:09 +01:00
David Roetzel
0231b6d350
Expose feature policy in API ( #37322 )
2025-12-19 15:20:30 +00: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
Matt Jankowski
7e817f2471
Extract filter_keywords helper method for listing filter keyword groups ( #35921 )
2025-12-17 14:48:58 +00: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
Matt Jankowski
a292162c5f
Mark Form::AdminSettings#persisted? as true ( #35872 )
2025-12-17 08:32:24 +00:00
Claire
780fefa700
Merge commit '53be8392eceea8c3a576478e209fe82c2ceb458a' into glitch-soc/merge-upstream
2025-12-16 18:27:03 +01:00
Matt Jankowski
53be8392ec
Add coverage for blocked account scenario in following/followers ( #36042 )
2025-12-16 16:13:03 +00:00
Matt Jankowski
95432b47eb
Add coverage for user model registration time validation ( #35993 )
2025-12-16 15:58:39 +00:00
Matt Jankowski
dbf8d77cbb
Add spec for missing username value in create account API ( #37057 )
2025-12-16 15:43:04 +00:00
Matt Jankowski
7e81e03531
Reduce factory creation across spec/helpers ( #35527 )
2025-12-16 15:26:04 +00:00
Matt Jankowski
92df1c4458
Add coverage for Account.representative from finder concern ( #35996 )
2025-12-16 15:05:26 +00:00
Matt Jankowski
7230c2059f
Add coverage for "domain variants" consumers ( #35995 )
2025-12-16 10:24:27 +00: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
bb72ecd466
Add simple API to remove item from collection ( #37225 )
2025-12-15 08:03:49 +00:00
David Roetzel
1766616ebc
Refactor relation preloading ( #37217 )
2025-12-15 07:35:46 +00:00
Claire
6503287c2d
Merge commit '4af8e83c8a236265c46a1b984fa5dbd3a7c73dfe' into glitch-soc/merge-upstream
2025-12-12 17:45:26 +01:00
David Roetzel
3cc4b59b41
First draft of API to add items to a collection ( #37222 )
2025-12-12 13:09:55 +00:00
Claire
53617cef5a
Merge commit 'd730f6b0c5cfb18894d1a9e34d0aa2556dda3c62' into glitch-soc/merge-upstream
2025-12-11 18:05:28 +01:00
Emelia Smith
d730f6b0c5
Add spec for client_credentials being used with /api/v1/apps/verify_credentials ( #37195 )
2025-12-11 16:40:22 +00: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
David Roetzel
adf8a3601d
Add service to add item to a collection ( #37192 )
2025-12-10 16:59:21 +00: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
David Roetzel
ea768c17db
Add counter cache to collections ( #37176 )
2025-12-09 10:31:35 +00:00
Matt Jankowski
e147947eb8
Add wrapstodon page spec ( #37168 )
2025-12-09 09:27:29 +00:00
Claire
05e45beb34
Merge commit '607449336da198ea9fe9c014220a5374a0ca1ae4' into glitch-soc/merge-upstream
2025-12-08 16:33:27 +01:00
David Roetzel
cf23f0414f
Add id to collection serializers ( #37157 )
2025-12-08 11:40:17 +00:00
David Roetzel
8625721805
Draft API to get all collections by an account ( #37139 )
2025-12-08 08:56:13 +00:00
Claire
2f6cdd6d47
Merge commit '1ae3b4672bffbc4aaf26f60c7063d6901239de5d' into glitch-soc/merge-upstream
2025-12-05 20:00:40 +01:00
Claire
3b4c4c5b09
Merge commit '65b216353e9bc9ae8517d967f8c2cd8122551fdc' into glitch-soc/merge-upstream
...
- `app/helpers/application_helper.rb`:
Upstream updated the classes used for theming purposes,
but glitch-soc has its own theming system.
Adapted upstream's changes.
- `spec/helpers/application_helper_spec.rb`:
Upstream updated the classes used for theming purposes,
but glitch-soc has its own theming system.
Adapted upstream's changes.
2025-12-05 19:25:40 +01:00
Claire
9b851616fe
Remove more unused data from 2025 annual reports ( #37134 )
2025-12-05 13:36:37 +00:00
diondiondion
591776d7ad
Fix inversion of emoji colours based on dark/light mode ( #37120 )
2025-12-05 10:08:59 +00:00
Claire
c8f365fd1d
Merge commit '0dac31dfd588e4cd866f382ed001a9535f06234a' into glitch-soc/merge-upstream
2025-12-04 20:59:54 +01:00
Claire
34aa825e96
Merge commit 'b3b5bf26d14f809a562244642949826b6a91bade' into glitch-soc/merge-upstream
2025-12-04 20:16:21 +01:00
diondiondion
65b216353e
Handle dark/light/contrast theme modes in common CSS ( #37095 )
2025-12-04 15:56:35 +00:00
David Roetzel
75b9e9a8b0
Enable missing before actions in Collection API ( #37122 )
2025-12-04 15:35:47 +00:00
Claire
88aed3c11a
Fix streamed quoted polls not being hydrated correctly ( #37118 )
2025-12-04 14:10:48 +00:00
David Roetzel
9921fa1af7
First draft API to delete collections ( #37117 )
2025-12-04 13:47:23 +00:00
David Roetzel
5a7a4fff11
First draft of Collection update API ( #37110 )
2025-12-04 10:00:21 +00:00
Matt Jankowski
832d8c7397
Use thread support helper in concurrent insert tag spec ( #37112 )
2025-12-04 09:11:53 +00:00
Matt Jankowski
d063af2594
Add coverage for array vs string in Tag.find_or_create_by ( #37113 )
2025-12-04 08:46:24 +00:00
Matt Jankowski
7c730e9041
Use normalizes API for Tag display_name value ( #35797 )
2025-12-03 15:39:01 +00:00
