mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-25 19:03:43 +01: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. |
||
---|---|---|
.. | ||
account_moderation_note_policy.rb | ||
account_policy.rb | ||
account_warning_policy.rb | ||
account_warning_preset_policy.rb | ||
announcement_policy.rb | ||
appeal_policy.rb | ||
application_policy.rb | ||
backup_policy.rb | ||
custom_emoji_policy.rb | ||
delivery_policy.rb | ||
domain_allow_policy.rb | ||
domain_block_policy.rb | ||
email_domain_block_policy.rb | ||
follow_recommendation_policy.rb | ||
instance_policy.rb | ||
invite_policy.rb | ||
ip_block_policy.rb | ||
poll_policy.rb | ||
preview_card_policy.rb | ||
preview_card_provider_policy.rb | ||
relay_policy.rb | ||
report_note_policy.rb | ||
report_policy.rb | ||
rule_policy.rb | ||
settings_policy.rb | ||
status_policy.rb | ||
tag_policy.rb | ||
user_policy.rb |