mirror of https://github.com/tootsuite/mastodon
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. |
||
|---|---|---|
| .. | ||
| account | ||
| account_gallery | ||
| account_timeline | ||
| audio | ||
| blocks | ||
| bookmarked_statuses | ||
| community_timeline | ||
| compose | ||
| direct_timeline | ||
| directory | ||
| domain_blocks | ||
| emoji | ||
| explore | ||
| favourited_statuses | ||
| favourites | ||
| follow_recommendations | ||
| follow_requests | ||
| followers | ||
| following | ||
| generic_not_found | ||
| getting_started | ||
| hashtag_timeline | ||
| home_timeline | ||
| introduction | ||
| keyboard_shortcuts | ||
| list_adder | ||
| list_editor | ||
| list_timeline | ||
| lists | ||
| mutes | ||
| notifications | ||
| picture_in_picture | ||
| pinned_statuses | ||
| public_timeline | ||
| reblogs | ||
| report | ||
| standalone | ||
| status | ||
| ui | ||
| video | ||