mirror of
https://github.com/funamitech/mastodon
synced 2024-12-13 06:09:08 +09:00
1474318691
Conflicts: - `app/models/trends/statuses.rb`: Upstream fixed a bug in the trending post condition. Glitch-soc's condition is different because we potentially allow CWed content to trend. Ported upstream's fix while keeping glitch-soc's change. - `config/initializers/content_security_policy.rb`: Kept our version for now, we will switch to upstream later down the road. |
||
---|---|---|
.. | ||
base.rb | ||
history.rb | ||
links.rb | ||
preview_card_batch.rb | ||
preview_card_filter.rb | ||
preview_card_provider_batch.rb | ||
preview_card_provider_filter.rb | ||
query.rb | ||
status_batch.rb | ||
status_filter.rb | ||
statuses.rb | ||
tag_batch.rb | ||
tag_filter.rb | ||
tags.rb |