Leatherface/mastodon
1
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,128 Commits 75 Branches 73 Tags
5fdcac60b99263c359a0aff2cc8172557a1ecce5
Commit Graph

28128 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
5fdcac60b9 Merge commit '64629eadb71afab79a741b016dc56a8bdf1d46f2' into glitch-soc/merge-upstream 2026-03-10 18:04:32 +01:00
Matt Jankowski
64629eadb7 Do not prepare returning user for unpersisted records (#38136) 2026-03-10 16:37:59 +00:00
David Roetzel
3b6d94ce62 Add column for html descriptions of collections (#38124) 2026-03-10 14:54:38 +00:00
Matt Jankowski
f6ea52e822 Add InstancesIndex coverage (#38129) 2026-03-10 14:45:17 +00:00
Andy Piper
c6322d8007 Update contributing docs (#38125) 
Signed-off-by: Andy Piper <andypiper@users.noreply.github.com>
 2026-03-10 12:53:20 +00:00
Duarte Serrano
75ef5bfd2d Fix short numbers rounding up instead of truncating (#37899) (#38114) 2026-03-10 11:28:44 +00:00
Eugen Rochko
69b1f60f4e Add support for FEP-3b86 (Activity Intents) (#38120) 2026-03-10 10:21:24 +00:00
diondiondion
7d58ce309c Fix collections not shown on profile when there are no featured tags or accounts (#38113) 2026-03-10 10:02:03 +00:00
github-actions[bot]
b64bed5acd New Crowdin Translations (automated) (#38122) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-10 10:01:38 +00:00
Matt Jankowski
cec60d5b71 Clean up search tagged specs (#38085) 2026-03-10 09:46:03 +00:00
Claire
bbd88f0b9b Merge pull request #3436 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 1d46558e8d
 2026-03-09 23:41:12 +01:00
diondiondion
71f9763e68 Fix erratic scroll-to-right on delete & redraft in Advanced UI (#38116) 2026-03-09 17:42:54 +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
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]
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]
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