Claire
799bd69189
Merge commit '2f657019201d73c9d86d1ece339e66e72954f0eb' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
Upstream refactored a line adjacent to a glitch-soc modified line.
Ported upstream changes.
2026-03-02 12:19:02 +01:00
David Roetzel
2f65701920
Add service to revoke inclusion in a Collection ( #38026 )
2026-03-02 10:16:41 +00:00
Claire
0e1ea3110e
Merge commit '7f16397f3c37a8e378239974b73afbfe2b6e6844' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/mastodon/version.rb`:
Upstream bumped the mastodon API version, glitch-soc has a change on an adjacent
line adding a glitch API version.
2026-02-27 21:25:37 +01:00
Matt Jankowski
7f16397f3c
Add validation spec for Form::Redirect model ( #38011 )
2026-02-27 17:05:29 +00:00
Matt Jankowski
9762b4a75c
Use normalizes for tag name attribute ( #37119 )
2026-02-27 15:56:08 +00:00
Matt Jankowski
e92b7beb75
Refactor tests for FeaturedTag#display_name ( #38007 )
2026-02-27 15:23:48 +00:00
David Roetzel
6b88dd4923
Issue FeatureAuthorizations ( #38004 )
2026-02-27 11:00:21 +00:00
Claire
3b7c33e763
Add exclude_direct flag to /api/v1/accounts/:id/statuses to exclude direct messages ( #37763 )
2026-02-27 09:34:12 +00:00
Claire
dc27eccc8e
Merge commit 'bca57020a04c552a3c91912a0e0b69ddafaad06a' into glitch-soc/merge-upstream
2026-02-26 18:27:02 +01:00
Claire
9c4d11f927
Add featured_tags to GET /api/v1/profile ( #37932 )
2026-02-26 16:18:42 +00:00
Matt Jankowski
5026bf6ac7
Use validation matchers for DisallowedHashtagValidator spec ( #37636 )
2026-02-26 15:56:16 +00:00
David Roetzel
b09e63da87
Federate activity when remote account is added to a Collection ( #37992 )
2026-02-26 15:11:02 +00:00
David Roetzel
51b81b3ce9
Allow remote accounts in Collections ( #37989 )
2026-02-26 13:31:23 +00:00
Claire
e3cb4dea42
Merge commit '4d2a148ccbedc818c98fd712a0b44869c1019321' into glitch-soc/merge-upstream
2026-02-25 19:11:22 +01:00
David Roetzel
f9326efef6
Add moderation consequences for collections ( #37974 )
2026-02-25 14:32:07 +00:00
David Roetzel
e2c9426c77
Split status batch and moderation actions ( #37970 )
2026-02-25 10:07:46 +00:00
Claire
c15c49b5b6
Merge commit '1e87bd178d96ab7d760f019fcf651ecc1585e701' into glitch-soc/merge-upstream
2026-02-24 15:14:25 +01:00
Claire
43ef9f66b6
Add PATCH /api/v1/profile ( #37934 )
2026-02-24 10:48:56 +00:00
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
85f72a3940
Merge commit '6ba6285a73c3a8b281123814d45f534e3bcebb96' into glitch-soc/merge-upstream
2026-02-20 21:08:06 +01:00
David Roetzel
6ba6285a73
Reject unconfirmed FASPs ( #37926 )
2026-02-20 14:40:31 +00:00
David Roetzel
7b85d21823
Re-use custom socket class for FASP requests ( #37925 )
2026-02-20 14:27:50 +00:00
Claire
cc1e65dcec
Add GET /api/v1/profile ( #37912 )
2026-02-20 10:16:04 +00:00
Claire
eebed16f59
Merge commit '8e7c3973dc67835e0ce9c7073b9344ec19d3910a' into glitch-soc/merge-upstream
2026-02-19 21:52:23 +01:00
Matt Jankowski
2a9de97cb6
Use validation matchers for UserEmailValidator spec ( #37908 )
2026-02-19 14:25:58 +00:00
Matt Jankowski
157583659a
Use validation matchers for UniqueUsernameValidator spec ( #37909 )
2026-02-19 13:14:12 +00:00
Matt Jankowski
40f92f3af8
Use validation matchers for UnreservedUsernameValidator spec ( #37910 )
2026-02-19 12:50:09 +00:00
David Roetzel
e288bf6516
Show reported collections in moderation interface ( #37898 )
2026-02-19 12:46:38 +00:00
Matt Jankowski
f48a299004
Use validation matchers for UrlValidator spec ( #37911 )
2026-02-19 11:11:46 +00:00
Claire
b041869887
Merge commit '3df8fb8fe9d33c7fbe51aa0a418b8b9ca46bb61b' into glitch-soc/merge-upstream
2026-02-18 18:40:03 +01:00
Matt Jankowski
66052e3ddd
Use validation matchers for StatusLengthValidator spec ( #37905 )
2026-02-18 15:22:22 +00:00
Matt Jankowski
e8ecf1719c
Use validation matchers for StatusPinValidator spec ( #37904 )
2026-02-18 15:09:38 +00:00
Matt Jankowski
a411b7eccb
Use validation matchers for PollOptionsValidator spec ( #37901 )
2026-02-18 13:44:59 +00:00
Matt Jankowski
9e40d3ef37
Use validation matchers for ReactionValidator spec ( #37900 )
2026-02-18 13:43:21 +00:00
Matt Jankowski
f95cd68667
Use validation matchers for NoteLengthValidator spec ( #37891 )
2026-02-18 10:33:26 +00:00
Matt Jankowski
371946fa80
Use validation matchers for LanguageValidator spec ( #37886 )
2026-02-17 14:59:31 +00:00
Nicholas La Roux
438602c488
Upgrade rubocop from v1.84.0 to v1.84.2, update config, and correct offences ( #37795 )
2026-02-17 14:56:46 +00:00
Claire
f47e2937cf
Merge commit '0b66e744263a4af1f14d03886ea2a9da4ca156db' into glitch-soc/merge-upstream
2026-02-17 12:11:33 +01:00
Claire
0b66e74426
Add GET /api/v1/donation_campaigns ( #37880 )
2026-02-17 10:54:21 +00:00
Claire
4a6d17ad7b
Fix hashtag matching by replacing negative lookbehind with positive lookbehind ( #37684 )
2026-02-17 10:27:36 +00:00
Matt Jankowski
7f28dd1179
Use validation matchers for FollowLimitValidator spec ( #37792 )
2026-02-17 09:03:46 +00:00
Matt Jankowski
2cb8471d81
Update doorkeeper i18n for invalid code challenge method ( #37827 )
2026-02-17 09:01:59 +00:00
Claire
5769ceb6e3
Merge commit '284c53f4391c0e2cdea788bc0aff73190913a488' into glitch-soc/merge-upstream
2026-02-16 13:35:39 +01:00
Matt Jankowski
1b724e9e12
Capture output in cli/emoji spec ( #37861 )
2026-02-16 08:24:39 +00:00
Claire
5f72148834
Merge commit '56ecdde1523cec87c55d3d0e7e9b6757dcfe2491' into glitch-soc/merge-upstream
2026-02-13 18:26:08 +01:00
Matt Jankowski
56ecdde152
Add ContentPoliciesHelper#policy_list to wrap string building in views ( #37856 )
2026-02-13 15:54:41 +00:00
Claire
ddc7df2064
Merge commit '6c3bd944f8890e1a349bd06e9585cb5ec25507e6' into glitch-soc/merge-upstream
2026-02-13 13:03:51 +01:00
David Roetzel
6c3bd944f8
Allow reporting (local) Collections ( #37848 )
2026-02-13 11:11:44 +00:00
Claire
e451416d90
Merge commit 'c44cc1f5c3bafb49a324f8f72a42a91d09eecfe3' into glitch-soc/merge-upstream
2026-02-12 18:00:45 +01:00
