Claire
30bb39fe54
Merge commit '8e00f7cc8fab9b447f80a27a972eef78186633ad' into glitch-soc/merge-upstream
2026-03-27 18:15:50 +01:00
Matt Jankowski
df9dec741f
Add private method for event export filename ( #38454 )
2026-03-27 15:25:19 +00:00
Claire
2ac493ee8e
Merge commit '9d5e10a70e006c1c0bc61e7f591b1078c7be6ab4' into glitch-soc/merge-upstream
2026-03-26 18:23:45 +01:00
Matt Jankowski
df479d598f
Expand coverage for Tag.search_for method ( #38405 )
2026-03-26 10:03:17 +00:00
Claire
79958d9442
Merge commit '31abef8917879917a330419fe3981a2fb7f35b69' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/post_status_service.rb`:
Upstream added a line adjacent to one that had been modified due to local-only posting.
Added upstream's change.
- `tsconfig.json`:
Upstream updated Typescript and updated `tsconfig` in the process by changing paths, where
glitch-soc had extra paths. Updated as upstream did.
2026-03-25 21:36:32 +01:00
Claire
572f18c322
Merge commit '664efcf4c3f9713894054fb642a252d8752a4123' into glitch-soc/merge-upstream
2026-03-25 21:09:30 +01:00
Eugen Rochko
bcf0718a9a
Add email subscriptions ( #38163 )
2026-03-25 16:25:45 +00:00
Claire
15dbf8040e
Add support for multiple keypairs for remote accounts ( #38279 )
2026-03-25 14:52:12 +00:00
Matt Jankowski
b399dc3191
Add coverage for "fields" feature of Account ( #38369 )
2026-03-25 10:23:45 +00:00
Claire
3d8e40f7c9
Merge commit 'c72ca33fac1ae1518371f5954ae9487692b17709' into glitch-soc/merge-upstream
2026-03-24 17:05:53 +01:00
David Roetzel
7788281759
Fix adding items without a position ( #38368 )
2026-03-24 14:43:50 +00:00
Claire
469076c357
Merge commit '4e276e4476c81482143440f1f405479e0e4be7eb' into glitch-soc/merge-upstream
2026-03-20 18:03:14 +01:00
Matt Jankowski
24d3c94f4a
Use delegate in web/push_subscription model for token value ( #38313 )
2026-03-20 15:48:28 +00:00
Claire
8f9eba9629
Add more tests around terminating streaming connections ( #38301 )
2026-03-20 10:00:30 +00:00
Claire
2b0531914f
Merge commit 'd52d0e4dedcc4c8ca12781681debe68f77c007e2' into glitch-soc/merge-upstream
2026-03-18 12:01:23 +01:00
Matt Jankowski
b497bb2908
Normalize current_username on account redirect form ( #38262 )
2026-03-18 09:33:00 +00:00
Claire
3593ddff11
Merge commit 'b320c9e4c901bf99ccbca321bad2ceb2f51de140' into glitch-soc/merge-upstream
2026-03-17 18:58:19 +01:00
Claire
04bf07a9cf
Merge commit 'c37bc5a8a94758e19b2d50db5e7816a96cec5cf4' into glitch-soc/merge-upstream
2026-03-17 18:01:07 +01:00
Matt Jankowski
9c4a072adf
Add missing require rails helper to recent moved files ( #38254 )
2026-03-17 15:16:32 +00:00
Matt Jankowski
c37bc5a8a9
Update model-concern-related spec locations for consistency ( #38200 )
2026-03-17 09:50:32 +00:00
Claire
73f77c49d8
Merge commit '16c41e035bdd6e08927c950aeeb5332adbe8b6d5' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/mastodon/version.rb`:
Upstream bumped the Mastodon API version, glitch-soc has an extra glitch version.
Bumped the Mastodon API version as upstream did.
2026-03-16 18:16:56 +01:00
Matt Jankowski
6b1eac8865
Use to_json call for Relay enable/disable ( #38232 )
2026-03-16 15:09:28 +00:00
Matt Jankowski
6044219746
Use to_json call for raw event strings ( #38215 )
2026-03-16 13:55:58 +00:00
Claire
4359098740
Merge commit '9c8be1e72146af247e2b6cdae6e1d37371506569' into glitch-soc/merge-upstream
2026-03-16 12:17:49 +01:00
Claire
5521aac4ab
Fix hashtags preceded by non-break spaces not being processed as such ( #38212 )
2026-03-16 09:39:18 +00:00
David Roetzel
c993daa347
Start of handling FeatureRequest activities ( #38193 )
2026-03-16 09:04:28 +00:00
David Roetzel
2f989c780a
Reinstate action logging ( #38211 )
2026-03-16 08:42:06 +00:00
Claire
3afb58ad18
Merge commit '89b7a3d7fb73ba79d33cab9755424b4aa2050b1b' into glitch-soc/merge-upstream
2026-03-14 11:41:24 +01:00
Matt Jankowski
6416724f75
Normalize current_username on account migration ( #38183 )
2026-03-13 09:33:02 +00:00
Claire
b5222606e3
Merge commit '811575a10903cada549580979cc809ca98ad570c' into glitch-soc/merge-upstream
2026-03-11 18:50:59 +01:00
David Roetzel
3091e2e525
Ingestion of remote collections ( #38144 )
2026-03-11 14:29:00 +00:00
Matt Jankowski
dc004caf71
Convert attempt IP from EmailDomainBlock history tracking to string before recording ( #38137 )
2026-03-11 10:49:07 +00:00
Claire
5fdcac60b9
Merge commit '64629eadb71afab79a741b016dc56a8bdf1d46f2' into glitch-soc/merge-upstream
2026-03-10 18:04:32 +01:00
Matt Jankowski
64629eadb7
Do not prepare returning user for unpersisted records ( #38136 )
2026-03-10 16:37:59 +00:00
David Roetzel
3b6d94ce62
Add column for html descriptions of collections ( #38124 )
2026-03-10 14:54:38 +00:00
Claire
8d717ab161
Merge commit '1d46558e8d949860acc4f3a86516b9989bd74f79' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/controllers/application_controller_spec.rb`:
Upstream moved specs that were textually-adjacent to glitch-soc ones.
Kept the glitch-soc ones.
2026-03-09 18:14:15 +01:00
David Roetzel
1d46558e8d
Ingestion of remote collection items ( #38106 )
2026-03-09 14:59:57 +00:00
Claire
4bcd0caa79
Merge commit 'e235c446c96280c015fb27f7eefe4e95a5a39892' into glitch-soc/merge-upstream
2026-03-09 12:41:12 +01:00
Matt Jankowski
3b1705a406
Add TermsOfService#usable_effective_date to DRY up view logic ( #38095 )
2026-03-09 09:38:00 +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
Claire
dc27eccc8e
Merge commit 'bca57020a04c552a3c91912a0e0b69ddafaad06a' into glitch-soc/merge-upstream
2026-02-26 18:27:02 +01: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
3508c8b2f6
Merge commit 'ef6405ab28e02686c0c9aa69d77eb43909be5f6f' into glitch-soc/merge-upstream
2026-02-23 18:20:47 +01:00
