mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-18 04:43:24 +00:00
193250556c
Conflicts: - `README.md`: Upstream changed their README, we have our own. Kept ours. - `app/helpers/application_helper.rb`: Minor code style fix upstream, on a line that is different in glitch-soc due to the different theming system. Applied the code style fix to our own code. - `app/views/settings/preferences/appearance/show.html.haml`: Code style fix on a line next to lines exclusive to glitch-soc. Applied upstream changes. - `yarn.lock`: Upstream updated a dependency textually close to a glitch-soc-only dependency. Updated the dependency like upstream did. |
||
---|---|---|
.. | ||
activitypub | ||
admin | ||
connection_pool | ||
importer | ||
nodeinfo | ||
ostatus | ||
rss | ||
settings | ||
translation_service | ||
vacuum | ||
access_token_extension.rb | ||
account_reach_finder.rb | ||
activity_tracker.rb | ||
advanced_text_formatter.rb | ||
application_extension.rb | ||
ascii_folding.rb | ||
cache_buster.rb | ||
delivery_failure_tracker.rb | ||
emoji_formatter.rb | ||
entity_cache.rb | ||
extractor.rb | ||
fast_geometry_parser.rb | ||
fast_ip_map.rb | ||
feed_manager.rb | ||
hash_object.rb | ||
hashtag_normalizer.rb | ||
html_aware_formatter.rb | ||
inline_renderer.rb | ||
link_details_extractor.rb | ||
permalink_redirector.rb | ||
plain_text_formatter.rb | ||
potential_friendship_tracker.rb | ||
rate_limiter.rb | ||
redis_configuration.rb | ||
request.rb | ||
request_pool.rb | ||
response_with_limit.rb | ||
scope_parser.rb | ||
scope_transformer.rb | ||
search_query_parser.rb | ||
search_query_transformer.rb | ||
status_cache_hydrator.rb | ||
status_filter.rb | ||
status_finder.rb | ||
status_reach_finder.rb | ||
suspicious_sign_in_detector.rb | ||
tag_manager.rb | ||
text_formatter.rb | ||
themes.rb | ||
translation_service.rb | ||
user_settings_decorator.rb | ||
vacuum.rb | ||
validation_error_formatter.rb | ||
video_metadata_extractor.rb | ||
webfinger.rb | ||
webfinger_resource.rb |