mastodon/lib
Claire 4113fbf6e8 Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream enforced new code style rules, where we had different code.
  Applied the new code style rules.
2023-12-17 23:04:16 +01:00
..
active_record Rails 7.1 update (#25963) 2023-10-23 17:58:29 +00:00
assets
chewy Add `ES_PRESET` option to customize numbers of shards and replicas (#26483) 2023-08-14 17:46:16 +02:00
devise
generators/post_deployment_migration
linter
mastodon Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream 2023-12-17 23:04:16 +01:00
paperclip Fix division by zero in video in bitrate computation code (#27129) 2023-09-25 17:07:52 +02:00
rails
redis Update rubocop and rubocop-rspec (#26329) 2023-08-22 09:31:40 +02:00
sanitize_ext Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream 2023-12-17 23:04:16 +01:00
simple_navigation
tasks Merge commit 'd9503a1965a16328b62ea7bf0bb54e87cbe30d29' into glitch-soc/merge-upstream 2023-10-24 19:21:01 +02:00
templates/haml/scaffold
terrapin
webpacker
exceptions.rb
http_extensions.rb Fix already initialized constant warning (#26542) 2023-08-18 16:06:46 +02:00
public_file_server_middleware.rb