mastodon/app/lib
Claire c04f2d0cf7 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  had a different lambda due to its theming system.
  Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  removed some code just after the lambda.
  Applied the same code style changes.
2023-07-17 19:02:23 +02:00
..
activitypub Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream 2023-07-12 16:03:05 +02:00
admin Update `Admin::Metrics::Measure` classes for Rails 7 (#25236) 2023-06-05 20:46:04 +02:00
connection_pool Update rubocop to v1.54.1 (#25627) 2023-07-13 11:11:55 +02:00
importer
nodeinfo
ostatus
rss Rails 7.0 update (#25668) 2023-07-13 09:36:07 +02:00
settings Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream 2023-06-05 13:25:22 +02:00
translation_service
vacuum Merge branch 'main' into glitch-soc/merge-upstream 2023-06-27 13:15:41 +02:00
webhooks Add webhook templating (#23289) 2023-06-06 10:42:47 +02:00
access_token_extension.rb
account_reach_finder.rb
activity_tracker.rb
advanced_text_formatter.rb
application_extension.rb
ascii_folding.rb
attachment_batch.rb Fix batch attachment deletion leaving empty directories (#25587) 2023-06-27 09:36:11 +02:00
cache_buster.rb
delivery_failure_tracker.rb
emoji_formatter.rb Fix `Style/SlicingWithRange` cop (#25923) 2023-07-12 10:03:06 +02:00
entity_cache.rb
extractor.rb
fast_geometry_parser.rb
fast_ip_map.rb
feed_manager.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-07-17 19:02:23 +02:00
hashtag_normalizer.rb
html_aware_formatter.rb
inline_renderer.rb Rails 7.0 update (#25668) 2023-07-13 09:36:07 +02:00
link_details_extractor.rb Autofix Rubocop Regex Style rules (#23690) 2023-06-06 14:50:51 +02:00
permalink_redirector.rb
plain_text_formatter.rb Autofix Rubocop Regex Style rules (#23690) 2023-06-06 14:50:51 +02:00
potential_friendship_tracker.rb
rate_limiter.rb
redis_configuration.rb
request.rb Merge pull request from GHSA-9pxv-6qvf-pjwc 2023-07-06 15:06:23 +02:00
request_pool.rb Update rubocop to v1.54.1 (#25627) 2023-07-13 11:11:55 +02:00
response_with_limit.rb
scope_parser.rb Fix OAuth apps page crashing when listing apps with certain admin API scopes (#25713) 2023-07-04 18:58:23 +02:00
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 Autofix Rubocop Regex Style rules (#23690) 2023-06-06 14:50:51 +02:00
text_formatter.rb Fix `Style/SlicingWithRange` cop (#25923) 2023-07-12 10:03:06 +02:00
themes.rb
translation_service.rb
user_settings_serializer.rb
vacuum.rb
validation_error_formatter.rb
video_metadata_extractor.rb
webfinger.rb
webfinger_resource.rb Autofix Rubocop Regex Style rules (#23690) 2023-06-06 14:50:51 +02:00