mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-16 11:53:13 +00:00
296b3d1560
Conflicts: - `.rubocop_todo.yml`: Upstream re-generated the file, while glitch-soc has a specific ignore for some file. Updated the file as upstream did and kept our extra ignore. - `config/webpack/shared.js`: Upstream added a plugin, but our files are pretty different. Added the plugin as well. - `spec/helpers/application_helper_spec.rb`: Upstream refactored tests, but part of them were different because of glitch-soc's theming system. Applied the refactoring to glitch-soc's change. |
||
|---|---|---|
| .. | ||
| chewy | ||
| controllers | ||
| helpers | ||
| javascript | ||
| lib | ||
| mailers | ||
| models | ||
| policies | ||
| presenters | ||
| serializers | ||
| services | ||
| validators | ||
| views | ||
| workers | ||