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. |
||
---|---|---|
.. | ||
about | ||
accounts | ||
admin | ||
admin_mailer | ||
application | ||
auth | ||
authorize_interactions | ||
directories | ||
disputes/strikes | ||
errors | ||
filters | ||
follower_accounts | ||
following_accounts | ||
home | ||
invites | ||
kaminari | ||
layouts | ||
media | ||
notification_mailer | ||
oauth | ||
public_timelines | ||
relationships | ||
remote_follow | ||
remote_interaction | ||
settings | ||
shared | ||
shares | ||
statuses | ||
statuses_cleanup | ||
tags | ||
user_mailer | ||
well_known/host_meta |