1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-14 06:38:39 +09:00
YuruToot/lib/mastodon
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
..
cli Extract methods for file movement in CLI::Upgrade (#25120) 2023-09-28 16:04:05 +02:00
migration_helpers.rb Move migration_helpers Rubocop ignore to config (#24236) 2023-10-03 14:58:40 +02:00
migration_warning.rb Migration warning helper, and only run in production env (#24253) 2023-03-26 00:39:24 +01:00
premailer_webpack_strategy.rb Fix Style/SlicingWithRange cop (#25923) 2023-07-12 10:03:06 +02:00
rack_middleware.rb Fix opening and closing Redis connections instead of using a pool (#18171) 2022-04-29 22:43:07 +02:00
redis_config.rb Update redis_config.rb to remove warning message (#24352) 2023-04-02 06:49:37 +02:00
sidekiq_middleware.rb Do not truncate backtrace when the BACKTRACE env variable is set (#26794) 2023-09-06 09:18:10 +02:00
snowflake.rb Fix account_id, max_id and min_id params not working in search (#26847) 2023-09-08 14:25:00 +02:00
version.rb Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream 2023-10-08 16:30:00 +02:00