Leatherface/mastodon
0
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 03:00:33 +02:00
Code Issues Packages Projects Releases Wiki Activity
28,252 Commits 75 Branches 73 Tags
5b9cb55701e8e36a374de67d6a821f597003bda5
Commit Graph

28252 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
diondiondion
5b9cb55701 [Glitch] Revamp heading levels in settings & admin pages 
Port 68984de5b5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-17 18:55:35 +01:00
Claire
bd9e7d6060 Merge commit '68984de5b503791b814d81a85520af256bf43e11' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/settings/discovery/show.html.haml`:
  Glitch-soc has an extra setting textually adjacent to a line upstream has changed.
  Applied upstream's change while keeping glitch-soc's setting.
 2026-03-17 18:53:00 +01:00
Claire
348a7a628f Merge pull request #3447 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to c37bc5a8a9
 2026-03-17 18:50:00 +01:00
Claire
04bf07a9cf Merge commit 'c37bc5a8a94758e19b2d50db5e7816a96cec5cf4' into glitch-soc/merge-upstream 2026-03-17 18:01:07 +01:00
Claire
dfccf6423c Merge pull request #3445 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 16c41e035b
 2026-03-17 18:00:23 +01:00
diondiondion
68984de5b5 Revamp heading levels in settings & admin pages (#38230) 2026-03-17 10:32:24 +00:00
Matt Jankowski
c37bc5a8a9 Update model-concern-related spec locations for consistency (#38200) 2026-03-17 09:50:32 +00:00
github-actions[bot]
75c5f30556 New Crowdin Translations (automated) (#38247) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-17 09:36:34 +00:00
renovate[bot]
089eeffc9e Update dependency rollup-plugin-gzip to v4.2.0 (#38209) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-17 09:25:09 +00:00
renovate[bot]
4b6f0cd5c5 Update dependency jsdom to v29 (#38210) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-17 09:25:04 +00:00
renovate[bot]
2f23d1acb9 Update dependency devise to v5.0.3 (#38245) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-17 09:08:01 +00:00
Matt Jankowski
f07e84f9de Rescue JSON::ParserError where already converted (#38244) 2026-03-17 08:57:10 +00:00
Echo
938f53a624 [Glitch] Profile editing: Finish image editing 
Port 4328807f28 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-16 18:31:24 +01:00
Echo
59879b7a61 [Glitch] Profile editing: Uploading avatar and header images 
Port 21c27eb3af to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-16 18:30:43 +01:00
Matt Jankowski
f5619fc8bc Use JSON.generate in db migrations (#38241) 2026-03-16 17:26:35 +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
Claire
b1942f4f43 Merge pull request #3444 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 9c8be1e721
 2026-03-16 18:02:39 +01:00
Matt Jankowski
16c41e035b Use JSON.parse in AP inboxes (#38238) 2026-03-16 16:58:13 +00: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
Echo
4328807f28 Profile editing: Finish image editing (#38235) 2026-03-16 15:56:30 +00:00
Matt Jankowski
703f2d0263 Use implicit to_json call in app/services (#38225) 2026-03-16 15:17:57 +00:00
Matt Jankowski
8792d6f840 Use JSON.generate in trivial string/hash conversion in specs (#38224) 2026-03-16 15:16:43 +00:00
Matt Jankowski
f460ad611a Use to_json call in web/push notification worker (#38233) 2026-03-16 15:12:38 +00:00
Matt Jankowski
0c75e97345 Use JSON.generate in backup service (#38234) 2026-03-16 15:10:10 +00:00
Matt Jankowski
6b1eac8865 Use to_json call for Relay enable/disable (#38232) 2026-03-16 15:09:28 +00:00
Matt Jankowski
092acbd47b Use to_json call for pins API (#38231) 2026-03-16 15:06:22 +00:00
Matt Jankowski
968ce25c39 Use to_json call for worker payloads (#38228) 2026-03-16 14:49:21 +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
8ed13bc6f7 Use to_json call for accounts API (#38226) 2026-03-16 14:40:03 +00:00
Matt Jankowski
7933fa4f94 Use to_json call in donation campaigns (#38223) 2026-03-16 14:32:05 +00:00
Matt Jankowski
c05492ed5a Use JSON.generate call for fan out service (#38222) 2026-03-16 14:31:58 +00:00
Claire
b7246518bf Add avatar_description and header_description parameters to PATCH /api/v1/profile (#38221) 2026-03-16 14:04:25 +00:00
Matt Jankowski
8124f1581a Use to_json call in cli/domains (#38219) 2026-03-16 14:03:20 +00:00
Matt Jankowski
1a464bc5ed Use to_json in simple view hash data-props build locations (#38218) 2026-03-16 14:02:52 +00:00
Matt Jankowski
330357507d Use to_json call for webhook service (#38217) 2026-03-16 14:01:37 +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
Matt Jankowski
f9b2dffaa8 Use JSON.generate call in push update worker (#38208) 2026-03-16 13:55:53 +00:00
Echo
21c27eb3af Profile editing: Uploading avatar and header images (#38189) 2026-03-16 11:39:52 +00:00
Claire
4359098740 Merge commit '9c8be1e72146af247e2b6cdae6e1d37371506569' into glitch-soc/merge-upstream 2026-03-16 12:17:49 +01:00
renovate[bot]
9c8be1e721 Update dependency immutable to v4.3.8 [SECURITY] (#38073) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-16 11:03:13 +00:00
David Roetzel
12c63a382c Handle adding already approved collection items (#38213) 2026-03-16 10:35:07 +00:00
Claire
62b90d73d7 Fixes some model definitions in tootctl maintenance fix-duplicates (#38214) 2026-03-16 10:00:08 +00: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
Matt Jankowski
8d5d66ecfc Remove unused react component helper method (#38207) 2026-03-16 09:02:21 +00:00
Matt Jankowski
e2bf09d57d Add timestamp spec for markers API response (#38206) 2026-03-16 08:48:10 +00:00