mastodon/config
Claire 7901dc9e24 Merge commit '491dd9764244c8adf37861f00d916c96bdbfdaf8' into glitch-soc/merge-upstream
Conflicts:
- `app/workers/scheduler/auto_close_registrations_scheduler.rb`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
2024-02-24 15:33:36 +01:00
..
environments Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream 2024-01-26 20:47:20 +01:00
imagemagick
initializers Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream 2024-02-24 14:46:14 +01:00
locales New Crowdin Translations (automated) (#29343) 2024-02-22 10:37:48 +00:00
locales-glitch New Crowdin Translations (automated) (#2564) 2024-01-26 19:45:04 +01:00
routes Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream 2024-01-25 19:51:19 +01:00
templates Move privacy policy into markdown file (#28699) 2024-01-19 11:22:23 +00:00
webpack Merge commit '01b6c83c369061c2175d50dfb3ae1db502862664' into glitch-soc/merge-upstream 2024-01-16 12:04:11 +01:00
application.rb Enable Rails 7.1 Marshalling format (#28609) 2024-01-05 21:57:47 +00:00
boot.rb Use `abort` instead of `warn(); exit` in boot.rb env check (#29209) 2024-02-16 14:29:24 +00:00
brakeman.yml Configure brakeman to ignore url safe preview card urls (#25883) 2023-10-20 15:32:16 +02:00
database.yml Using Sidekiq concurrency for default db pool value (#26488) 2023-11-08 13:15:43 +00:00
deploy.rb Fix `Lint/SymbolConversion` cop (#28175) 2023-12-01 15:53:35 +00:00
environment.rb
formatjs-formatter.js
i18n-tasks.yml Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 2023-12-20 22:16:50 +01:00
navigation.rb Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream 2023-10-24 19:31:14 +02:00
pghero.yml
puma.rb
roles.yml
routes.rb Merge commit 'fa0ba677538588086d83c97c0ea56f9cd1556590' into glitch-soc/merge-upstream 2024-02-24 14:18:16 +01:00
secrets.yml
settings.yml
sidekiq.yml Automatically switch from open to approved registrations in absence of moderators (#29318) 2024-02-22 20:45:40 +01:00
storage.yml
webpacker.yml