tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,182 Commits 5 Branches 0 Tags
Commit Graph

28182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
1b49ef10d2
Merge pull request #3440 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 377952703cf70f14008cc7938479558d8cca9903
 2026-03-12 20:12:20 +01:00
Claire
208b556c18 Merge commit '377952703cf70f14008cc7938479558d8cca9903' into glitch-soc/merge-upstream 2026-03-12 19:03:08 +01:00
Claire
d099de23c5 Merge commit 'bf32befcc21831b31f684795bb211b2f1f4cfb6d' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/status.rb`:
  Upstream reordered model annotations, while glitch-soc has extra columns.
  Reordered as upstream did.
- `app/models/status_edit.rb`:
  Upstream reordered model annotations, while glitch-soc has extra columns.
  Reordered as upstream did.
 2026-03-12 19:01:28 +01:00
Echo
a7974df51a [Glitch] Profile editing: Edit image menu 
Port 420136e83b65a467a62da739a679ccb579525e63 to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-12 18:53:39 +01:00
diondiondion
ba7db10fd0 [Glitch] Fix extra border on accounts in settings page 
Port 13c94db9e7d7f35264c7e1ac93f6e693b0014592 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-12 18:51:04 +01:00
Eugen Rochko
263615b74f [Glitch] Change order of onboarding steps 
Port 51894ac247c84f577b46e69094b3581fd6e78375 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-12 18:50:13 +01:00
Claire
3833eadfbf Merge commit 'adede83c7c9a943cf9954fe865becf6a0c2d2280' into glitch-soc/merge-upstream 2026-03-12 18:48:32 +01:00
David Roetzel
377952703c
Add serializers for Accept+Reject of feature requests (#38177) 2026-03-12 15:46:36 +00:00
renovate[bot]
7511357ec6
Update opentelemetry-ruby (non-major) (#38138) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-12 14:09:17 +00:00
Nicholas La Roux
21a8ff5351
Upgrade from Ruby 3.4.8 to 3.4.9 (#38154) 2026-03-12 14:04:35 +00:00
Matt Jankowski
7778db1418
Truncate unsupported/EOL version changelogs (#38173) 2026-03-12 14:04:21 +00:00
Matt Jankowski
bf32befcc2
Run annotaterb models after bug fix to re-order model comments (#38172) 2026-03-12 14:00:41 +00:00
Echo
adede83c7c
Updates to latest Material Icons (#38171) 2026-03-12 11:17:43 +00:00
David Roetzel
eeed483518
Handle Remove of an individual collection item (#38170) 2026-03-12 11:11:39 +00:00
Echo
420136e83b
Profile editing: Edit image menu (#38156) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2026-03-12 10:42:29 +00:00
David Roetzel
353c8b2abf
Handle Remove activity on featuredCollections (#38169) 2026-03-12 10:37:53 +00:00
diondiondion
13c94db9e7
Fix extra border on accounts in settings page (#38168) 2026-03-12 10:19:06 +00:00
Hugo Gameiro
4552cda15a
Fix OpenStack Swift Keystone token rate limiting (#38145) 2026-03-12 10:15:49 +00:00
David Roetzel
94aa5d7c9e
Handle Add activity to featuredCollections (#38167) 2026-03-12 10:14:22 +00:00
github-actions[bot]
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 811575a10903cada549580979cc809ca98ad570c
 2026-03-11 19:35:19 +01:00
diondiondion
979ef236ca [Glitch] Collection editor: Format topic as hashtag 
Port 3ef7d2835a5ef36bac71cd392710b5ea10602cb1 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 4a08ab64d1d22e0572e85a2ace18347ec00b2ff6 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 20932752fee1dc3da856fdb9fadc8df5aaae23f1 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 12c6c6dcf9a6875db03dbb9d66eed897c1d964e3 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 f971670c620db61da4dadff07efe86b51c145bfd 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 9916c786e67080e71b6f8fc36d11f5d8daa233d9 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 316290ba9d25358f88a9616ba9cbc30b8ccef453 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]
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 64629eadb71afab79a741b016dc56a8bdf1d46f2
 2026-03-10 18:46:37 +01:00