Claire
89c2ac444f
Merge commit '9e0a3aaf08e7d4fc700f7f19d61f5f8fee346b6a' into glitch-soc/merge-upstream
2026-06-10 18:52:58 +02:00
Matt Jankowski
c51eb56a90
Clarify preview card CLI command handles media only ( #39348 )
2026-06-10 09:27:07 +00:00
Claire
e08c8b6933
Merge commit 'b48f907b20e2c9909665a484041845697d26f17c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/settings_helper.rb`:
Upstream added a new helper.
Conflict caused by the fact there is a glitch-soc specific helper.
Added upstream's new helper in addition to glitch-soc's.
2026-06-09 21:30:54 +02:00
David Roetzel
200fda1cdc
Add collection reach finder ( #39346 )
2026-06-09 14:22:21 +00:00
Nicholas La Roux
4a5a915e86
Migrate a few tests to use NotificationAssertions ( #38098 )
2026-06-08 16:01:20 +00:00
Matt Jankowski
fc64804b4d
Update rubocop-rspec to version 3.10.1 ( #39303 )
2026-06-08 15:27:34 +00:00
Claire
659a077616
Merge commit '07236016bcc78a82205093b3e067bf4a1bb07d88' into glitch-soc/merge-upstream
2026-06-03 12:19:05 +02:00
Pia B.
07236016bc
Merge commit from fork
...
* add guard clause to check for node attributes
* check for encoding attribute specifically
* check for encoding attribute specifically
* change spec
2026-06-03 12:12:37 +02:00
Claire
3cf0fb7ba0
Merge commit 'facb552c9cdbe8a2ebff0b94ebf2c9e9ec385347' into glitch-soc/merge-upstream
2026-06-01 18:00:03 +02:00
zunda
423d0ca875
Extract text from language tagged strings for link preview ( #39190 )
2026-06-01 15:10:08 +00:00
Claire
ae2ff31f32
Merge commit '0caf334891e0a5f4e995f1d667eb83d3aad7e41e' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/mastodon/version.rb`:
Upstream updated the API version, while we also have a custom glitch API version.
Updated as upstream did.
2026-05-30 12:13:35 +02:00
David Roetzel
572612fde9
Remove collections feature flag ( #39211 )
2026-05-29 09:37:42 +00:00
David Roetzel
faa5944d46
Hydrate user-specific feature approval policy ( #39194 )
2026-05-28 19:52:49 +00:00
Claire
487c814eb9
Merge commit '6a4d14b178fc00de989b4a2758f2a1e4adf5ed33' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Glitch-soc allows a wider range of HTML than upstream.
Upstream added `:all => %w(lang)`, which was not supported by glitch-soc,
added it there too.
2026-05-22 19:43:42 +02:00
Claire
cdf721a273
Fix remote statuses with large media descriptions being rejected ( #39135 )
2026-05-21 15:46:10 +00:00
Claire
99f0a03dec
Merge commit 'b2aa476abbe82e2b49d84c9fb8ef654f95391fd3' into glitch-soc/merge-upstream
2026-05-07 18:26:17 +02:00
Claire
b2aa476abb
Redirect with interstitial when trying to view a remote collection while logged out ( #38941 )
2026-05-07 16:04:26 +00:00
Claire
80a452220c
Merge commit 'cb2e7705848e602b7cdc513560004715134b10d4' into glitch-soc/merge-upstream
2026-05-05 18:01:14 +02:00
Claire
3bc27b9b64
Resolve unknown tagged collections in remote posts ( #38900 )
2026-05-05 14:46:47 +00:00
Claire
44394878a4
Merge commit 'c6facd27ed191177afb003640b8ee7d0742c7f63' into glitch-soc/merge-upstream
2026-04-30 19:00:48 +02:00
Matt Jankowski
59f3d8a993
Handle IPv6 scenario in custom Request::Socket ( #38866 )
2026-04-30 16:03:55 +00:00
David Roetzel
1f1653e039
Remove rejected and revoked collection items ( #38792 )
2026-04-28 11:10:25 +00:00
David Roetzel
d5f8b08d69
Add collections to Flag activities ( #38817 )
2026-04-28 11:09:43 +00:00
Claire
e0a34e6d89
Merge commit 'b15d234ccb5d004180561c440dd45536d70e67b2' into glitch-soc/merge-upstream
2026-04-17 18:06:10 +02:00
Matt Jankowski
d5f0e37260
Include hosts resolver in request socket DNS lookup ( #38699 )
2026-04-17 08:09:37 +00:00
Claire
b9014ec220
Merge commit '66fdd3ae65e13349fbc0b2818d4b91a389075553' into glitch-soc/main
2026-04-08 19:32:32 +02:00
Claire
39c70649ca
Add added_to_collection and collection_updated notification types ( #38491 )
2026-04-08 12:56:07 +00:00
Claire
7a4747122e
Merge commit 'ca5c0a144ade4bff7bd10446a39d86116879884e' into glitch-soc/merge-upstream
...
- `CODE_OF_CONDUCT.md`:
Adopt upstream's new Code of Conduct
2026-04-01 19:11:21 +02:00
David Roetzel
62479b7b0a
Remove collections_federation feature flag ( #38508 )
2026-04-01 08:55:41 +00:00
Claire
2ac493ee8e
Merge commit '9d5e10a70e006c1c0bc61e7f591b1078c7be6ab4' into glitch-soc/merge-upstream
2026-03-26 18:23:45 +01:00
Matt Jankowski
ea009d5062
Avoid rubocop:disable for private address spec ( #38420 )
2026-03-26 15:03:10 +00:00
David Roetzel
abd29109c5
Fetch unknown collection when handling FeatureRequest activity ( #38413 )
2026-03-26 13:30:27 +00:00
Claire
806e2a993a
Fix Webfinger endpoint not handling new AP ID scheme ( #38391 )
2026-03-26 09:58:47 +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
15dbf8040e
Add support for multiple keypairs for remote accounts ( #38279 )
2026-03-25 14:52:12 +00:00
David Roetzel
c9eefd0ae7
Persist activity URI of a FeatureRequest ( #38393 )
2026-03-25 14:32:15 +00:00
Claire
60236bffe6
Merge commit '0ef43a431d353a17419ea6664ed745b5dbfbf2f9' into glitch-soc/merge-upstream
2026-03-24 12:13:39 +01:00
David Roetzel
e4e584a99e
Handle Update of a FeaturedCollection ( #38337 )
2026-03-23 15:57:02 +00:00
Claire
39d9da3b82
Tag linked FeaturedCollection objects over ActivityPub ( #38115 )
2026-03-23 13:11:33 +00:00
Claire
469076c357
Merge commit '4e276e4476c81482143440f1f405479e0e4be7eb' into glitch-soc/merge-upstream
2026-03-20 18:03:14 +01:00
David Roetzel
ccf6f16f05
Handle Delete of a FeatureAuthorization ( #38292 )
2026-03-20 09:51:20 +00:00
Claire
842bac86f6
Merge commit 'db074fc3e2b671e28a44ae379e6df1fcbdbbce53' into glitch-soc/merge-upstream
2026-03-18 18:01:57 +01:00
Matt Jankowski
815c2cf8e9
Clean up Webfinger lib spec ( #38259 )
2026-03-18 13:23:06 +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
b320c9e4c9
Prefer to_json over JSON.generate when simple strings in stub request ( #38258 )
2026-03-17 16:10:54 +00:00
David Roetzel
f3035a8e51
Handle Reject of a FeatureRequest ( #38256 )
2026-03-17 15:59:51 +00:00
Matt Jankowski
b9d25bde3e
Convert mix of JSON.parse and JSON.load_file ( #38242 )
2026-03-17 13:27:57 +00:00
Matt Jankowski
4d33490ec8
Update chewy to version 8.0.1 ( #37983 )
2026-03-17 13:27:37 +00:00
David Roetzel
5f36c482d2
Handle Accept of a FeatureRequest ( #38251 )
2026-03-17 11:45:00 +00:00
