tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,613 Commits 5 Branches 0 Tags
8032905c5549fde8564e782dbac366a2fe98d137
Commit Graph
28613 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
github-actions[bot]andGitHub Actions 7f9df6d02d New Crowdin Translations (automated) (#38164) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-12 09:53:59 +00:00
Matt Jankowski 2330f11cad Remove unused @markdown from user mailer terms action (#38160) 2026-03-12 09:22:56 +00:00
David Roetzel 84d8020165 Store a remote actor's featuredCollections URI (#38166) 2026-03-12 09:11:32 +00:00
Eugen Rochko 51894ac247 Change order of onboarding steps (#38121) 2026-03-11 21:07:31 +00:00
Claire 3492283a9e Merge pull request #3439 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 811575a109
 2026-03-11 19:35:19 +01:00
diondiondion 979ef236ca [Glitch] Collection editor: Format topic as hashtag 
Port 3ef7d2835a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-11 18:55:45 +01:00
Echo 99b43f225c [Glitch] Profile editing: Always show field buttons 
Port 4a08ab64d1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-11 18:55:18 +01:00
diondiondion 18aefaea62 [Glitch] Refactor collection editor state handling 
Port 20932752fe to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-11 18:54:52 +01:00
Echo 006b06199f [Glitch] Profile editing: Add warning for links 
Port 12c6c6dcf9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-11 18:54:22 +01:00
Echo 3ed3ce4e05 [Glitch] Profile editing: Fix bug with reordering 
Port f971670c62 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-11 18:53:42 +01:00
Claire 0dddc44eb5 [Glitch] Add fallback to Object intent for FEP-3b86 in remote interaction helper 
Port 9916c786e6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-11 18:53:10 +01:00
diondiondion a76ee2e233 [Glitch] Prevent hover card from showing unintentionally 
Port 316290ba9d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-11 18:52:39 +01:00
Claire b5222606e3 Merge commit '811575a10903cada549580979cc809ca98ad570c' into glitch-soc/merge-upstream 2026-03-11 18:50:59 +01:00
Matt Jankowski 811575a109 Use bundler version 4.0.8 (#38150) 2026-03-11 17:11:28 +00:00
Matt Jankowski 0a216003ff Disable use_multi_json for json validator / match_json_schema (#38151) 2026-03-11 17:11:00 +00:00
diondiondion 3ef7d2835a Collection editor: Format topic as hashtag (#38153) 2026-03-11 17:04:37 +00:00
David Roetzel 3091e2e525 Ingestion of remote collections (#38144) 2026-03-11 14:29:00 +00:00
Echo 4a08ab64d1 Profile editing: Always show field buttons (#38152) 2026-03-11 13:52:44 +00:00
diondiondion 20932752fe Refactor collection editor state handling (#38133) 2026-03-11 13:20:56 +00:00
Echo 12c6c6dcf9 Profile editing: Add warning for links (#38148) 2026-03-11 13:19:39 +00:00
Echo f971670c62 Profile editing: Fix bug with reordering (#38147) 2026-03-11 12:09:54 +00:00
renovate[bot] da4b717211 Update dependency rspec-rails to v8.0.4 (#38146) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-11 10:53:38 +00:00
Matt Jankowski dc004caf71 Convert attempt IP from EmailDomainBlock history tracking to string before recording (#38137) 2026-03-11 10:49:07 +00:00
Matt Jankowski d047a10cf5 Use around_action to set locale in admin/notification mailers (#38140) 2026-03-11 10:18:24 +00:00
github-actions[bot]andGitHub Actions d39f867931 New Crowdin Translations (automated) (#38143) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-11 10:16:06 +00:00
renovate[bot] 68f4fe7425 Update dependency fastimage to v2.4.1 (#38135) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-11 10:05:54 +00:00
Matt Jankowski 53f4d7f029 Update RemoteIp patch with Rails 8.1 changes (#38139) 2026-03-11 09:51:49 +00:00
Claire 32fc5304a7 Change HTTP signatures to skip the Accept header (#38132) 2026-03-11 09:49:52 +00:00
Claire 9916c786e6 Add fallback to Object intent for FEP-3b86 in remote interaction helper (#38130) 2026-03-11 09:42:24 +00:00
diondiondion 316290ba9d Prevent hover card from showing unintentionally (#38112) 2026-03-11 07:42:36 +00:00
Claire 9602f6fcc3 Merge pull request #3437 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 64629eadb7
 2026-03-10 18:46:37 +01:00
Duarte Serrano 42716c94bf [Glitch] Fix short numbers rounding up instead of truncating (#37899) 
Port 75ef5bfd2d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-10 18:12:54 +01:00
Eugen Rochko 4150cee7a5 [Glitch] Add support for FEP-3b86 (Activity Intents) 
Port 69b1f60f4e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-10 18:12:54 +01:00
diondiondion 19a8c80762 [Glitch] Fix collections not shown on profile when there are no featured tags or accounts 
Port 7d58ce309c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-10 18:12:54 +01:00
diondiondion 7e57d00af6 [Glitch] Fix erratic scroll-to-right on delete & redraft in Advanced UI 
Port 71f9763e68 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-10 18:12:54 +01:00
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]andGitHub Actions 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