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. |
||
---|---|---|
.. | ||
activitypub | ||
admin | ||
connection_pool | ||
nodeinfo | ||
ostatus | ||
rss | ||
settings | ||
access_token_extension.rb | ||
account_reach_finder.rb | ||
activity_tracker.rb | ||
application_extension.rb | ||
cache_buster.rb | ||
delivery_failure_tracker.rb | ||
entity_cache.rb | ||
extractor.rb | ||
fast_geometry_parser.rb | ||
fast_ip_map.rb | ||
feed_manager.rb | ||
formatter.rb | ||
hash_object.rb | ||
inline_renderer.rb | ||
link_details_extractor.rb | ||
permalink_redirector.rb | ||
potential_friendship_tracker.rb | ||
rate_limiter.rb | ||
request.rb | ||
request_pool.rb | ||
response_with_limit.rb | ||
rss_builder.rb | ||
search_query_parser.rb | ||
search_query_transformer.rb | ||
status_filter.rb | ||
status_finder.rb | ||
status_reach_finder.rb | ||
tag_manager.rb | ||
themes.rb | ||
toc_generator.rb | ||
user_settings_decorator.rb | ||
validation_error_formatter.rb | ||
video_metadata_extractor.rb | ||
webfinger.rb | ||
webfinger_resource.rb |