Glitch-Shrike/config
Claire 11dd51ef44 Merge commit '63ba69810eca80fc2d10114a79f2988c1b75892f' into glitch-soc/merge-upstream
Conflicts:
- `.env.production.sample`:
  Upstream and glitch-soc had different comments, some comments got updated upstream.
  Updated them in glitch-soc accordingly.
2024-07-06 21:02:42 +02:00
..
environments Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream 2024-06-17 18:30:28 +02:00
imagemagick Drop favicon.ico generation (#30375) 2024-06-26 13:44:08 +00:00
initializers Merge commit '63ba69810eca80fc2d10114a79f2988c1b75892f' into glitch-soc/merge-upstream 2024-07-06 21:02:42 +02:00
locales New Crowdin Translations (automated) (#30925) 2024-07-05 09:09:40 +00:00
locales-glitch Fix bogus translations 2024-06-08 13:28:41 +02:00
routes Merge commit '63ba69810eca80fc2d10114a79f2988c1b75892f' into glitch-soc/merge-upstream 2024-07-06 21:02:42 +02:00
templates Unpluralize mistakenly changed privacy template (#30759) 2024-06-18 21:34:17 +00:00
webpack Replace `use_pack`, `layouts/theme` and `@theme` by new helpers 2024-04-28 15:45:42 +02:00
application.rb Fix compatibility with Redis < 6.2 again (#30412) 2024-06-19 16:59:37 +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
database.yml
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 '2c5ab8f647841ea8075ece50ccc9e12c21af8720' into glitch-soc/merge-upstream 2024-05-22 21:05:19 +02:00
pghero.yml
puma.rb
roles.yml
routes.rb Merge commit 'd3f504245cab5a9a0e89262e0a1398d035dffac9' into glitch-soc/merge-upstream 2024-07-01 20:45:13 +02:00
secrets.yml
settings.yml Merge commit '02ea16150647ac3baf0bb8a89203ccc7200b4a2f' into glitch-soc/merge-upstream 2024-05-01 14:25:47 +02:00
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 Merge commit '3f6887557b23d363e7f8f18518db4447739d64bb' into glitch-soc/merge-upstream 2024-05-04 14:59:00 +02:00