mastodon/app/lib
Claire 12b935fadf Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, removed in glitch-soc to disable noise.
  Kept removed.
- `CODE_OF_CONDUCT.md`:
  Upstream updated to a new version of the covenant, but I have not read it
  yet, so kept unchanged.
- `Gemfile.lock`:
  Not a real conflict, one upstream dependency updated textually too close to
  the glitch-soc only `hcaptcha` dependency.
  Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/application_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/helpers/application_helper.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream added a highlight animation for onboarding, while we changed the
  max character limit.
  Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `stylelint.config.js`:
  Upstream added ignore paths, glitch-soc had extra ignore paths.
  Added the same paths as upstream.
2023-04-29 10:44:56 +02:00
..
activitypub Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
admin Update retention model sql query (#24249) 2023-03-26 00:37:57 +01:00
connection_pool
importer Autofix Rubocop Rails/Pluck (#23730) 2023-02-20 02:28:40 +01:00
nodeinfo
ostatus Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
rss Fix errors when rendering RSS feeds (#18531) 2022-05-26 23:02:42 +02:00
settings Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
translation_service Replace `Status#translatable?` with language matrix in separate endpoint (#24037) 2023-03-16 11:07:24 +01:00
vacuum Merge branch 'main' into glitch-soc/merge-upstream 2023-02-09 12:46:12 +01:00
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 Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
advanced_text_formatter.rb Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
application_extension.rb Fix confirmation redirect to app without `Location` header (#18523) 2022-05-26 22:03:54 +02:00
ascii_folding.rb Change how hashtags are normalized (#18795) 2022-07-13 15:03:28 +02:00
cache_buster.rb
delivery_failure_tracker.rb Apply Rubocop Performance/DoubleStartEndWith (#23442) 2023-02-08 10:06:48 +09:00
emoji_formatter.rb Drop EOL Ruby 2.7 (#24237) 2023-04-27 01:46:18 +02:00
entity_cache.rb
extractor.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
fast_geometry_parser.rb
fast_ip_map.rb
feed_manager.rb Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
hash_object.rb
hashtag_normalizer.rb Improve performance by avoiding regex construction (#20215) 2022-11-10 05:49:30 +01:00
html_aware_formatter.rb Advertise supported MIME types for statuses (#2090) 2023-01-20 13:57:32 +01:00
inline_renderer.rb Add caching for payload serialization during fan-out (#19642) 2022-11-04 13:21:06 +01:00
link_details_extractor.rb Autofix Rubocop Rails/Pluck (#23730) 2023-02-20 02:28:40 +01:00
permalink_redirector.rb Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
plain_text_formatter.rb Drop EOL Ruby 2.7 (#24237) 2023-04-27 01:46:18 +02:00
potential_friendship_tracker.rb
rate_limiter.rb Autofix Rubocop Lint/AmbiguousOperatorPrecedence (#23681) 2023-02-18 04:30:23 +01:00
redis_configuration.rb Add retention policy for cached content and media (#19232) 2022-09-27 03:08:19 +02:00
request.rb Refactor monkey-patching of `PrivateAddressCheck` (#24122) 2023-03-16 04:33:38 +01:00
request_pool.rb Autofix Rubocop Style/RescueStandardError (#23745) 2023-02-20 11:01:20 +01:00
response_with_limit.rb
scope_parser.rb Change authorized applications page (#17656) 2022-03-01 16:48:58 +01:00
scope_transformer.rb Apply Rubocop Performance/StringIdentifierArgument (#23444) 2023-02-08 02:36:20 +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_cache_hydrator.rb Fix status cache hydration discrepancy (#19879) 2022-12-15 18:55:55 +01:00
status_filter.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
status_finder.rb Autofix Rubocop Style/IfUnlessModifier (#23697) 2023-02-18 12:37:47 +01:00
status_reach_finder.rb Don't delivery a reply to domains which are blocked by author (#22117) 2022-12-15 15:52:06 +01:00
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 Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
text_formatter.rb Drop EOL Ruby 2.7 (#24237) 2023-04-27 01:46:18 +02:00
themes.rb Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
translation_service.rb Replace `Status#translatable?` with language matrix in separate endpoint (#24037) 2023-03-16 11:07:24 +01:00
user_settings_serializer.rb Change user settings to be stored in a more optimal way (#23630) 2023-03-30 14:44:00 +02:00
vacuum.rb Add retention policy for cached content and media (#19232) 2022-09-27 03:08:19 +02:00
validation_error_formatter.rb Enable Rubocop Style/StringConcatenation defaults (#23792) 2023-02-22 09:54:36 +09:00
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 Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
webfinger_resource.rb