mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02: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. |
||
|---|---|---|
| .. | ||
| trends | ||
| accounts_statuses_cleanup_scheduler.rb | ||
| backup_cleanup_scheduler.rb | ||
| doorkeeper_cleanup_scheduler.rb | ||
| email_domain_block_refresh_scheduler.rb | ||
| email_scheduler.rb | ||
| feed_cleanup_scheduler.rb | ||
| follow_recommendations_scheduler.rb | ||
| instance_refresh_scheduler.rb | ||
| ip_cleanup_scheduler.rb | ||
| media_cleanup_scheduler.rb | ||
| pghero_scheduler.rb | ||
| scheduled_statuses_scheduler.rb | ||
| user_cleanup_scheduler.rb | ||