donphan/config
Claire 2b0410f903 Merge commit 'f7aab0cc2ff47337021d50ed52428abcb7a9b518' into glitch-soc/backports-4.3
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper, while glitch-soc had extra helpers.
  Added upstream's helper.
2024-10-18 17:19:57 +02:00
..
environments Merge commit '491033c86cc9c29302bfe68cc94dabad82ded4cc' into glitch-soc/merge-upstream 2024-09-02 17:43:10 +02:00
imagemagick Drop favicon.ico generation (#30375) 2024-06-26 13:44:08 +00:00
initializers Merge commit 'f7aab0cc2ff47337021d50ed52428abcb7a9b518' into glitch-soc/backports-4.3 2024-10-18 17:19:57 +02:00
locales New Crowdin Translations for stable-4.3 (automated) (#32576) 2024-10-18 10:11:59 +02:00
locales-glitch New Crowdin Translations (automated) (#2738) 2024-07-10 18:18:15 +02:00
routes Merge branch 'stable-4.3' into glitch-soc/backports-4.3 2024-10-05 20:45:05 +02:00
templates Unpluralize mistakenly changed privacy template (#30759) 2024-06-18 21:34:17 +00:00
webpack Merge commit '06f070d86d448b97c082c038220becaec8a038ce' into glitch-soc/merge-upstream 2024-07-24 20:07:37 +02:00
application.rb Refactor (ruby) redis configuration (#31694) 2024-09-02 14:19:55 +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
environment.rb Enable Rubocop Style/FrozenStringLiteralComment (#23793) 2023-07-12 09:47:08 +02:00
formatjs-formatter.js Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream 2023-06-10 12:38:33 +02:00
i18n-tasks.yml Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 2023-12-20 22:16:50 +01:00
navigation.rb Merge branch 'stable-4.3' into glitch-soc/backports-4.3 2024-10-05 20:45:05 +02:00
pghero.yml
puma.rb Enable Rubocop Style/FrozenStringLiteralComment (#23793) 2023-07-12 09:47:08 +02:00
roles.yml
routes.rb Merge branch 'stable-4.3' into glitch-soc/backports-4.3 2024-10-05 20:45:05 +02:00
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