Claire
3508c8b2f6
Merge commit 'ef6405ab28e02686c0c9aa69d77eb43909be5f6f' into glitch-soc/merge-upstream
2026-02-23 18:20:47 +01:00
David Roetzel
b785f05ddb
Add coverage for StatusBatchAction ( #37949 )
2026-02-23 13:22:24 +00:00
Claire
f47e2937cf
Merge commit '0b66e744263a4af1f14d03886ea2a9da4ca156db' into glitch-soc/merge-upstream
2026-02-17 12:11:33 +01:00
Claire
4a6d17ad7b
Fix hashtag matching by replacing negative lookbehind with positive lookbehind ( #37684 )
2026-02-17 10:27:36 +00:00
Claire
e451416d90
Merge commit 'c44cc1f5c3bafb49a324f8f72a42a91d09eecfe3' into glitch-soc/merge-upstream
2026-02-12 18:00:45 +01:00
David Roetzel
f57167c61a
Add ID/URI to collection items ( #37842 )
2026-02-12 15:31:45 +00:00
Claire
2373c5a132
Merge commit 'ca9966ce2ff79dcac90b2feced65fa991534d53e' into glitch-soc/merge-upstream
2026-02-11 20:26:56 +01:00
Claire
dfe44bcaef
Add ability to require 2FA for specific roles (including Everybody) ( #37701 )
2026-02-11 14:34:09 +00:00
Claire
8f58c42ca3
Merge commit '2e30044a374811bc94fd62a8159cb2c9ffe18a4d' into glitch-soc/merge-upstream
2026-02-06 22:45:55 +01:00
Echo
7a4945c0d3
Show mute end date in badge ( #37747 )
2026-02-05 20:01:28 +00:00
Claire
36be9bbebf
Merge commit 'a495a0cbfcf9f6111c0e598af0864de2b76e4111' into glitch-soc/merge-upstream
2026-01-28 19:29:10 +01:00
Matt Jankowski
f861a5cee0
Add action_logs association for account ( #36022 )
2026-01-28 11:04:00 +00:00
Claire
5a45a3203a
Merge commit '7af5ba271d6f04831f000e9b815914375e42abeb' into glitch-soc/merge-upstream
2026-01-27 18:03:27 +01:00
Claire
9ea64fcb5a
Fix last_status_at not accurately tracking last status time for remote accounts ( #37619 )
2026-01-27 13:23:12 +00:00
Claire
b96c8ecff4
Merge commit '89c1b9a8fdfe38881ad1b6c22f20240b087aa993' into glitch-soc/merge-upstream
2026-01-26 18:09:54 +01:00
Matt Jankowski
876ccfe0a3
Use Report#local? delegation more broadly ( #37596 )
2026-01-26 09:43:21 +00:00
Matt Jankowski
f7a2e5c715
Use validation matchers for InstanceModerationNote spec ( #37597 )
2026-01-26 09:42:55 +00:00
Claire
8b95254883
Merge commit 'c36db57acedf0033c090748125c665a0360cd11f' into glitch-soc/merge-upstream
2026-01-23 17:57:20 +01:00
Matt Jankowski
29ec2cd186
Add targeted_account_notes association to simplify usage ( #35540 )
2026-01-23 16:35:19 +00:00
Matt Jankowski
157d8c0d99
Remove deprecated usage of imagemagick ( #37488 )
2026-01-22 14:57:19 +00:00
Matt Jankowski
7b9479239a
Typo fix in federation document ( #37564 )
2026-01-22 13:59:36 +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
5d04c56c48
Merge commit '400c1f3e8ec0ffd33ad30d9334b9210cdb89b14c' into glitch-soc/merge-upstream
2026-01-20 16:14:14 +01:00
David Roetzel
7cdc05b9a8
Add language attribute to collections ( #37549 )
2026-01-20 13:22:54 +00:00
David Roetzel
51224bb437
Add "featured collections" collection to actors ( #37512 )
2026-01-20 08:27:05 +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
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
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
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
95432b47eb
Add coverage for user model registration time validation ( #35993 )
2025-12-16 15:58:39 +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
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
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
Claire
34aa825e96
Merge commit 'b3b5bf26d14f809a562244642949826b6a91bade' into glitch-soc/merge-upstream
2025-12-04 20:16:21 +01: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
David Roetzel
4e6d1892b9
Fix creation of duplicate conversations ( #37108 )
2025-12-03 14:33:27 +00:00
David Roetzel
2d203ca72a
First draft of API to get a single collection ( #37053 )
2025-12-01 15:04:52 +00:00
Christian Oelschlegel
1f9ddb7cf6
fix(tag): prevent dupl. tags on concurrent inserts ( #35792 )
...
Co-authored-by: Christian Oelschlegel <oelschle@sciphy.de>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2025-12-01 14:56:52 +00:00
Claire
44e6abe48b
Merge commit '0004ed4c8021ebd400d32eb32a5e479ebd7bcf91' into glitch-soc/merge-upstream
2025-11-30 16:40:18 +01:00
