mirror of
https://github.com/mastodon/mastodon.git
synced 2025-01-31 06:21:50 +01:00
Claire
be493b6c0d
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/models/account.rb`: Not a real conflict, just upstream getting rid of unused constants too close to glitch-soc-specific contents. Removed unused constants like upstream did. - `app/models/trends.rb`: Conflict because glitch-soc disabled email notifications for trending links. Upstream has refactored this quite a bit and added trending posts. Took upstream code, but disabling the extra trending stuff will come in another commit. - `app/views/admin/trends/links/index.html.haml`: Conflict due to glitch-soc's theming system. Ported upstream changes accordingly.
Prevent translations from accidentally becoming completely different from source strings on Crowdin without translators noticing. (#17085)
Mastodon Glitch Edition
Now with automated deploys!
So here's the deal: we all work on this code, and anyone who uses that does so absolutely at their own risk. can you dig it?
- You can view documentation for this project at glitch-soc.github.io/docs/.
- And contributing guidelines are available here and here.
Languages
Ruby
64.4%
JavaScript
16.8%
TypeScript
9.2%
SCSS
4.7%
Haml
4.4%
Other
0.5%