Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 07:49:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
8649681c515a4b878a187eb37a4b7a9cf70aaadc
mastodon/app
History
Claire 8649681c51 Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/activitypub/note_serializer.rb`:
  Conflict because upstream added context extensions where glitch-soc had its own.
  Added upstream's new context extension while keeping ours.
2025-07-25 21:45:00 +02:00
..
chewy
Change account search to be more forgiving of spaces (#34455)
2025-04-25 10:35:21 +00:00
controllers
Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream
2025-07-25 21:45:00 +02:00
helpers
Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream
2025-07-25 21:45:00 +02:00
inputs
Add age verification on sign-up (#34150)
2025-03-14 14:07:29 +00:00
javascript
Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream
2025-07-25 21:45:00 +02:00
lib
Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream
2025-07-25 21:45:00 +02:00
mailers
Add optional bulk mailer settings (#35203)
2025-06-30 14:49:14 +00:00
models
Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream
2025-07-25 21:45:00 +02:00
policies
Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream
2025-07-25 21:45:00 +02:00
presenters
Update OAuth inflection to match spec (#35160)
2025-06-25 07:52:30 +00:00
serializers
Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream
2025-07-25 21:45:00 +02:00
services
Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream
2025-07-25 21:45:00 +02:00
validators
Merge commit '2f98134ac69ee840095c9d8389e4b2fff72f20c1' into glitch-soc/merge-upstream
2025-03-15 17:49:32 +01:00
views
Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream
2025-07-25 21:45:00 +02:00
workers
Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream
2025-07-25 21:45:00 +02:00