tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,375 Commits 5 Branches 0 Tags
Commit Graph

1910 Commits

Author SHA1 Message Date
Claire
3d8e40f7c9 Merge commit 'c72ca33fac1ae1518371f5954ae9487692b17709' into glitch-soc/merge-upstream 2026-03-24 17:05:53 +01:00
Claire
4559e4ed1a
Merge commit from fork 2026-03-24 15:44:08 +01: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
d48470a1fc
Change media description length limit for remote media attachments from 1500 to 10000 characters (#37921) 2026-03-23 10:32:41 +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
fac3080289 Merge commit 'cffa8de6267a57673b7f6264fab671153f965d23' into glitch-soc/merge-upstream 2026-03-19 12:38:31 +01:00
Claire
d9dbe62417
Fix error when processing Add activity where the target is embedded and not a special collection (#38282) 2026-03-19 08:13:50 +00:00
Claire
b305b3b2db Fix stray glitch-soc-only use of Oj gem 2026-03-18 12:02:13 +01: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
David Roetzel
f3035a8e51
Handle Reject of a FeatureRequest (#38256) 2026-03-17 15:59:51 +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
Matt Jankowski
f07e84f9de
Rescue JSON::ParserError where already converted (#38244) 2026-03-17 08:57:10 +00:00
Matt Jankowski
653161fecc
Convert remaining JSON.generate (#38240) 2026-03-16 17:18:16 +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
3832030711
Convert Oj.load -> JSON.parse in most places (#38236) 2026-03-16 16:38:19 +00:00
Matt Jankowski
0e14224eaf
Use JSON.parse in user settings (#38237) 2026-03-16 16:08:17 +00:00
Matt Jankowski
d9cd65f039
Use to_json call for AP::QuoteRequest accept/reject paths (#38229) 2026-03-16 14:49:09 +00:00
Matt Jankowski
70230c632c
Use to_json call for AP::Follow reject path (#38227) 2026-03-16 14:40:51 +00:00
Matt Jankowski
638429037f
Use to_json call for libre translate api (#38216) 2026-03-16 13:58:39 +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
David Roetzel
c993daa347
Start of handling FeatureRequest activities (#38193) 2026-03-16 09:04:28 +00:00
Claire
3833eadfbf Merge commit 'adede83c7c9a943cf9954fe865becf6a0c2d2280' into glitch-soc/merge-upstream 2026-03-12 18:48:32 +01:00
David Roetzel
eeed483518
Handle Remove of an individual collection item (#38170) 2026-03-12 11:11:39 +00:00
David Roetzel
353c8b2abf
Handle Remove activity on featuredCollections (#38169) 2026-03-12 10:37:53 +00:00
David Roetzel
94aa5d7c9e
Handle Add activity to featuredCollections (#38167) 2026-03-12 10:14:22 +00:00
Claire
b5222606e3 Merge commit '811575a10903cada549580979cc809ca98ad570c' into glitch-soc/merge-upstream 2026-03-11 18:50:59 +01:00
Claire
32fc5304a7
Change HTTP signatures to skip the Accept header (#38132) 2026-03-11 09:49:52 +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
73d97153d8
Update connection_pool to version 3.0.2 (#38103) 2026-03-09 10:01:48 +00:00
Matt Jankowski
fcc3fac8a8
Fix Style/ReduceToHash cop (#38088) 2026-03-09 10:01:12 +00:00
Matt Jankowski
eabbda3148
Fix Style/SelectByKind cop (#38084) 2026-03-09 09:34:58 +00:00
Claire
c96db36396 Merge commit '8a0261c51caf76b6d12e3801da471759c31c9608' into glitch-soc/merge-upstream 2026-03-04 12:40:16 +01:00
Claire
8a0261c51c
Add missing_attribution boolean to preview cards (#38043) 2026-03-04 11:18:37 +00:00
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
Matt Jankowski
d845a8a289
Fix violations to existing cops from rubocop v1.85.0 (#38015) 2026-03-02 08:47:45 +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
7e5e96739f
Use consistent calling style for TagManager#normalize_domain (#35764) 2026-02-27 16:38:34 +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
Matt Jankowski
1dbb258d53
Update rails to version 8.1.2 (#36505) 2026-02-27 07:50:35 +00:00
Claire
85f72a3940 Merge commit '6ba6285a73c3a8b281123814d45f534e3bcebb96' into glitch-soc/merge-upstream 2026-02-20 21:08:06 +01:00
David Roetzel
7b85d21823
Re-use custom socket class for FASP requests (#37925) 2026-02-20 14:27:50 +00:00
Claire
b041869887 Merge commit '3df8fb8fe9d33c7fbe51aa0a418b8b9ca46bb61b' into glitch-soc/merge-upstream 2026-02-18 18:40:03 +01:00