tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,816 Commits 5 Branches 0 Tags
83ea9b94de798a93ca06ea0629e4920e3421c4e5
Commit Graph
28816 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Claire 9d805196a7 Merge pull request #3432 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to e235c446c9
 2026-03-09 18:12:07 +01:00
David Roetzel 1d46558e8d Ingestion of remote collection items (#38106) 2026-03-09 14:59:57 +00:00
diondiondion e616200e59 [Glitch] Allow removing yourself from a collection 
Port 3a796544e3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-09 12:42:58 +01:00
Claire 4bcd0caa79 Merge commit 'e235c446c96280c015fb27f7eefe4e95a5a39892' into glitch-soc/merge-upstream 2026-03-09 12:41:12 +01:00
Matt Jankowski 2c6d072175 Extract ErrorResponses from application controller (#38105) 2026-03-09 11:30:41 +00:00
Claire e235c446c9 Fix broken option defaults in tootctl email-domain-blocks (#38107) 2026-03-09 11:26:16 +00:00
renovate[bot] 4211b1b34c Update dependency faker to v3.6.1 (#38074) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-09 10:47:20 +00: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
diondiondion 3a796544e3 Allow removing yourself from a collection (#38096) 2026-03-09 09:54:17 +00:00
github-actions[bot]andGitHub Actions 5838fce8f4 New Crowdin Translations (automated) (#38100) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-09 09:50:28 +00:00
Matt Jankowski 3b1705a406 Add TermsOfService#usable_effective_date to DRY up view logic (#38095) 2026-03-09 09:38:00 +00:00
renovate[bot] d7a1bead51 Update dependency aws-sdk-s3 to v1.215.0 (#38067) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-09 09:35:20 +00:00
Matt Jankowski eabbda3148 Fix Style/SelectByKind cop (#38084) 2026-03-09 09:34:58 +00:00
renovate[bot] 5090036edf Update dependency hiredis-client to v0.27.0 (#38092) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-09 09:34:19 +00:00
renovate[bot] 6a6a97f314 Update dependency json-schema to v6.2.0 (#38093) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-09 09:34:01 +00:00
Matt Jankowski 2ad0b32dd5 Add basic ES-enabled index/service coverage (#38097) 2026-03-09 09:31:56 +00:00
Claire 44f4f73ad2 Merge pull request #3431 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to eb848d082a
 2026-03-07 18:14:15 +01:00
Echo f4fb7d6b7a [Glitch] Profile editing: Rearranging and adding fields 
Port eb848d082a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-07 17:30:14 +01:00
Claire a4af7a531d Merge commit 'eb848d082afc8864b2aa15858f414e4867902c65' into glitch-soc/merge-upstream 2026-03-07 17:29:09 +01:00
Claire 7e7a8cea52 Merge pull request #3430 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 3d8d5f6dc7
 2026-03-06 14:27:16 +01:00
Echo eb848d082a Profile editing: Rearranging and adding fields (#38083) 2026-03-06 12:57:06 +00:00
github-actions[bot]andGitHub Actions 11fb1df7a6 New Crowdin Translations (automated) (#38091) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-06 11:39:35 +00:00
renovate[bot] 169552ff06 Update dependency aws-sdk-core to v3.243.0 (#38089) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-06 11:16:28 +00:00
diondiondion c56496d22e [Glitch] Remove minimum account limit on collections 
Port 3d8d5f6dc7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-05 18:46:34 +01:00
diondiondion 141cd0a741 [Glitch] Hide account list in sensitive collections 
Port 3557be5d4d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-05 18:46:34 +01:00
Echo 7575226495 [Glitch] Profile editing: Custom fields (deleting, editing) 
Port dae0926c1f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-05 18:46:34 +01:00
Claire fa3794ea27 [Glitch] Fix “Unblock” and “Unmute” actions being disabled when blocked 
Port dd27c7b917 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-05 18:46:34 +01:00
diondiondion b6774279bd [Glitch] Add "Collections" link to main navigation 
Port 748dbf3217 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-05 18:46:31 +01:00
Matt Jankowski 812c109e87 Remove message argument from NoteLengthValidator error approach (#37977) 2026-03-05 17:44:52 +00:00
Claire 0a989af8c6 Merge commit '3d8d5f6dc7625d9638cc2e3387247442225d4e3f' into glitch-soc/merge-upstream 2026-03-05 18:21:07 +01:00
diondiondion 3d8d5f6dc7 Remove minimum account limit on collections (#38082) 2026-03-05 15:57:27 +00:00
diondiondion 3557be5d4d Hide account list in sensitive collections (#38081) 2026-03-05 15:43:57 +00:00
renovate[bot] 0f37901955 Update dependency htmlentities to v4.4.2 (#38080) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-05 15:34:22 +00:00
Matt Jankowski 58ef0f6aee Move chewy enable for spec to search data manager (#38054) 2026-03-05 15:07:41 +00:00
Claire 9b4a09f760 Fix poll expiration notification being re-triggered on implicit updates (#38078) 2026-03-05 14:53:00 +00:00
Matt Jankowski 4e3866dbaf Replace email_spec gem with built-in matchers (#38079) 2026-03-05 14:42:21 +00:00
renovate[bot] 5d4271a3cc Update dependency rollup-plugin-visualizer to v6.0.11 (#38051) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-05 14:37:58 +00:00
Echo dae0926c1f Profile editing: Custom fields (deleting, editing) (#38066) 2026-03-05 10:48:19 +00:00
Matt Jankowski 6d9c16e4a1 Fix incorrect I18n string in webauthn mailers (#38062) 2026-03-05 10:37:12 +00:00
github-actions[bot]andGitHub Actions 94954aed5e New Crowdin Translations (automated) (#38070) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-05 09:27:43 +00:00
Claire dd27c7b917 Fix “Unblock” and “Unmute” actions being disabled when blocked (#38075) 2026-03-05 09:10:49 +00:00
diondiondion 748dbf3217 Add "Collections" link to main navigation (#38065) 2026-03-05 09:01:08 +00:00
renovate[bot] eefdf7ecdf Update dependency linzer to v0.7.8 (#38050) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-05 08:56:32 +00:00
Claire 922fbb8c17 Add for searching already-known private GtS posts (#38057) 2026-03-05 08:56:18 +00:00
Claire 4a22dd3605 Merge pull request #3429 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to a70079968c
 2026-03-04 19:57:49 +01:00
Claire 8287661a0b Fix unnecessary difference with upstream 2026-03-04 19:01:19 +01:00
ThibG 6e6036af14 [Glitch] Fix “X new items” not showing up for slow mode on empty timelines 
Port 2d5addde03 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-04 19:00:43 +01:00
diondiondion 8384961937 [Glitch] Break ScrollableList component into parts 
Port a70079968c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-04 18:53:57 +01:00