mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-24 14:17:08 +00:00
be493b6c0d
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. |
||
|---|---|---|
| .. | ||
| disputes | ||
| reports | ||
| trends | ||
| account_actions_controller.rb | ||
| account_moderation_notes_controller.rb | ||
| accounts_controller.rb | ||
| action_logs_controller.rb | ||
| announcements_controller.rb | ||
| base_controller.rb | ||
| change_emails_controller.rb | ||
| confirmations_controller.rb | ||
| custom_emojis_controller.rb | ||
| dashboard_controller.rb | ||
| domain_allows_controller.rb | ||
| domain_blocks_controller.rb | ||
| email_domain_blocks_controller.rb | ||
| follow_recommendations_controller.rb | ||
| instances_controller.rb | ||
| invites_controller.rb | ||
| ip_blocks_controller.rb | ||
| relationships_controller.rb | ||
| relays_controller.rb | ||
| report_notes_controller.rb | ||
| reports_controller.rb | ||
| resets_controller.rb | ||
| roles_controller.rb | ||
| rules_controller.rb | ||
| settings_controller.rb | ||
| sign_in_token_authentications_controller.rb | ||
| site_uploads_controller.rb | ||
| statuses_controller.rb | ||
| subscriptions_controller.rb | ||
| tags_controller.rb | ||
| two_factor_authentications_controller.rb | ||
| warning_presets_controller.rb | ||