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,275 Commits 75 Branches 73 Tags
b305b3b2db9ab51fd48e9c67f315991988ccc061
Commit Graph

28275 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
b305b3b2db Fix stray glitch-soc-only use of Oj gem 2026-03-18 12:02:13 +01:00
Claire
2b0531914f Merge commit 'd52d0e4dedcc4c8ca12781681debe68f77c007e2' into glitch-soc/merge-upstream 2026-03-18 12:01:23 +01:00
Claire
d52d0e4ded Update dependency action_text-trix (#38271) 2026-03-18 10:11:05 +00:00
Matt Jankowski
b497bb2908 Normalize current_username on account redirect form (#38262) 2026-03-18 09:33:00 +00:00
github-actions[bot]
5e7f221cab New Crowdin Translations (automated) (#38267) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-18 09:17:33 +00:00
Matt Jankowski
e839a94b93 Use with_index iterator in backup service (#38264) 2026-03-18 09:11:14 +00:00
Nicholas La Roux
36400681cf Remove oj and its initializer and add json to the Gemfile (#37752) 2026-03-18 09:02:11 +00:00
Claire
5a1e9a6f5e Merge pull request #3448 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to b320c9e4c9
 2026-03-17 20:34:40 +01:00
Itoh Shimon
984e9f4e83 [Glitch] Fix vertically written textareas 
Port efa76ace8a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-17 18:59:21 +01:00
diondiondion
a6a013c21b [Glitch] Improve accessibility of sign-up progress indicator 
Port 75c4ff35d2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-17 18:59:01 +01:00
Claire
3593ddff11 Merge commit 'b320c9e4c901bf99ccbca321bad2ceb2f51de140' into glitch-soc/merge-upstream 2026-03-17 18:58:19 +01:00
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
diondiondion
11112fa9dc Remove superfluous SCSS imports file (#38261) 2026-03-17 17:39:21 +00: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
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
90840b3ede Rename deprecated ffmpeg vsync arg to fps_mode (#38198) 2026-03-17 15:44:50 +00:00
Itoh Shimon
efa76ace8a Fix vertically written textareas (#38205) 2026-03-17 15:43:49 +00:00
Matt Jankowski
9c4a072adf Add missing require rails helper to recent moved files (#38254) 2026-03-17 15:16:32 +00:00
David Roetzel
96c93ba835 Only persist a collection item's approval URI once it is verified (#38255) 2026-03-17 15:14:30 +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
renovate[bot]
3d4364a2a6 Update dependency pg to v8.20.0 (#38076) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-17 13:21:36 +00:00
diondiondion
75c4ff35d2 Improve accessibility of sign-up progress indicator (#38252) 2026-03-17 12:44:40 +00:00
David Roetzel
5f36c482d2 Handle Accept of a FeatureRequest (#38251) 2026-03-17 11:45:00 +00: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