mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-25 00:05:20 +00:00
b368c75029
Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Upstream removed this file, while glitch-soc had changes to deal with its theming system. Removed the file like upstream did. |
||
---|---|---|
.. | ||
activitypub | ||
connection_pool | ||
ostatus | ||
rss | ||
settings | ||
advanced_text_formatter_spec.rb | ||
delivery_failure_tracker_spec.rb | ||
emoji_formatter_spec.rb | ||
entity_cache_spec.rb | ||
extractor_spec.rb | ||
fast_ip_map_spec.rb | ||
feed_manager_spec.rb | ||
hash_object_spec.rb | ||
html_aware_formatter_spec.rb | ||
link_details_extractor_spec.rb | ||
permalink_redirector_spec.rb | ||
plain_text_formatter_spec.rb | ||
request_pool_spec.rb | ||
request_spec.rb | ||
sanitize_config_spec.rb | ||
scope_transformer_spec.rb | ||
status_filter_spec.rb | ||
status_finder_spec.rb | ||
status_reach_finder_spec.rb | ||
suspicious_sign_in_detector_spec.rb | ||
tag_manager_spec.rb | ||
text_formatter_spec.rb | ||
user_settings_decorator_spec.rb | ||
webfinger_resource_spec.rb |