mastodon/lib
Claire f05985f8ec Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our version.
2023-09-21 15:12:00 +02:00
..
active_record Fix Style/SlicingWithRange cop (#25923) 2023-07-12 10:03:06 +02: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
json_ld
linter Consistently use middle dot (·) instead of bullet (•) to separate items (#25248) 2023-06-02 19:58:18 +02:00
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2023-09-19 17:32:48 +02:00
paperclip Change video bitrate to always fit within size limit (#26970) 2023-09-19 12:25:58 +02:00
rails Enable Rubocop Style/FrozenStringLiteralComment (#23793) 2023-07-12 09:47:08 +02:00
redis Update rubocop and rubocop-rspec (#26329) 2023-08-22 09:31:40 +02:00
sanitize_ext Merge branch 'main' into glitch-soc/merge-upstream 2023-07-06 15:16:34 +02:00
simple_navigation
tasks Merge branch 'main' into glitch-soc/merge-upstream 2023-09-21 15:12:00 +02:00
templates/haml/scaffold
terrapin
webpacker Fix the crossorigin attribute (#26096) 2023-07-21 11:14:26 +02:00
exceptions.rb
http_extensions.rb Fix already initialized constant warning (#26542) 2023-08-18 16:06:46 +02:00
public_file_server_middleware.rb Add hardened headers to user-uploaded files (#25756) 2023-07-06 14:31:37 +02:00