Conflicts: - `config/initializers/cors.rb`: Upstream refactored this file, and glitch-soc had local changes. I could not find the rationale for the glitch-soc changes, so I used upstream's version. |
||
|---|---|---|
| .. | ||
| cli | ||
| migration_helpers.rb | ||
| migration_warning.rb | ||
| premailer_webpack_strategy.rb | ||
| rack_middleware.rb | ||
| redis_config.rb | ||
| sidekiq_middleware.rb | ||
| snowflake.rb | ||
| version.rb | ||