glitch-social/lib
Claire ac2370778a Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream
Conflicts:
- `config/environments/production.rb`:
  Upstream enforced a code style change and glitch-soc had a few different lines.
  Applied upstream's code style to glitch-soc's changes.
2023-10-08 17:21:12 +02:00
..
active_record
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
json_ld
linter
mastodon Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream 2023-10-08 17:21:12 +02: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
simple_navigation
tasks Merge branch 'main' into glitch-soc/merge-upstream 2023-09-21 15:12:00 +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