This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/lib
Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Fix erroneous deletion in a previous merge.
- `Gemfile`:
  Conflict caused by glitch-soc-only hCaptcha dependency
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/controllers/filters_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/serializers/rest/status_serializer.rb`:
  Minor conflict due to glitch-soc having an extra `local_only` property
2022-06-28 11:11:18 +02:00
..
activitypub Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
admin Add admin dashboard checks for Elasticsearch version (#17863) 2022-03-25 21:00:59 +01:00
connection_pool
importer Change algorithm of `tootctl search deploy` to improve performance (#18463) 2022-05-22 22:16:43 +02:00
nodeinfo
ostatus
rss Fix errors when rendering RSS feeds (#18531) 2022-05-26 23:02:42 +02:00
settings
access_token_extension.rb Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
account_reach_finder.rb
activity_tracker.rb
advanced_text_formatter.rb Fix leading spaces being stripped in Markdown code blocks 2022-05-24 10:24:59 +02:00
application_extension.rb Fix confirmation redirect to app without `Location` header (#18523) 2022-05-26 22:03:54 +02:00
cache_buster.rb
delivery_failure_tracker.rb Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
emoji_formatter.rb Change RSS feeds (#18356) 2022-05-09 07:43:08 +02:00
entity_cache.rb
extractor.rb Fix being able to post URLs longer than 4096 characters (#17908) 2022-03-30 14:46:03 +02:00
fast_geometry_parser.rb
fast_ip_map.rb
feed_manager.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
hash_object.rb
html_aware_formatter.rb Add advanced text formatting back into glitch-soc 2022-03-28 22:21:37 +02:00
inline_renderer.rb
link_details_extractor.rb Add workaround for YouTube Shorts links (#17869) 2022-03-25 19:31:35 +01:00
permalink_redirector.rb
plain_text_formatter.rb Refactor formatter (#17828) 2022-03-26 02:53:34 +01:00
potential_friendship_tracker.rb
rate_limiter.rb
redis_configuration.rb Fix opening and closing Redis connections instead of using a pool (#18171) 2022-04-29 22:43:07 +02:00
request.rb
request_pool.rb
response_with_limit.rb
scope_parser.rb Change authorized applications page (#17656) 2022-03-01 16:48:58 +01:00
scope_transformer.rb Change authorized applications page (#17656) 2022-03-01 16:48:58 +01:00
search_query_parser.rb
search_query_transformer.rb Fix error resposes for `from` search prefix (#17963) 2022-04-08 21:21:49 +02:00
status_filter.rb
status_finder.rb
status_reach_finder.rb
suspicious_sign_in_detector.rb Remove sign-in token authentication, instead send e-mail about new sign-in (#17970) 2022-04-06 20:58:12 +02:00
tag_manager.rb Fix TagManager#local_url? erroring out on invalid URL (#18580) 2022-05-31 18:25:24 +02:00
text_formatter.rb Refactor formatter (#17828) 2022-03-26 02:53:34 +01:00
themes.rb
toc_generator.rb
user_settings_decorator.rb Various code cleanup (#1782) 2022-05-25 12:27:11 +02:00
validation_error_formatter.rb
video_metadata_extractor.rb Fix some media attachments being converted with too high framerates (#17619) 2022-02-22 17:11:22 +01:00
webfinger.rb Fix error caused by missing subject in Webfinger response (#18204) 2022-05-01 00:37:46 +02:00
webfinger_resource.rb