catstodon/config
Jeremy Kescher 655d28f6a7
Merge remote-tracking branch 'upstream/main' into develop
Also apply "Make addReaction and removeReaction optional props", therefore:

Co-authored by: Essem <smswessem@gmail.com>
2024-09-20 11:53:07 +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 remote-tracking branch 'upstream/main' into develop 2024-09-20 11:53:07 +02:00
locales Merge remote-tracking branch 'upstream/main' into develop 2024-09-20 11:53:07 +02:00
locales-glitch Merge branch 'refs/heads/glitch' into develop 2024-07-16 22:32:15 +02:00
routes Merge remote-tracking branch 'upstream/main' into develop 2024-09-20 11:53:07 +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 Merge remote-tracking branch 'upstream/main' into develop 2024-09-10 16:15:59 +02: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 commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream 2024-08-12 17:46:24 +02:00
pghero.yml Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595) 2020-05-04 13:52:41 +02:00
puma.rb Enable Rubocop Style/FrozenStringLiteralComment (#23793) 2023-07-12 09:47:08 +02:00
roles.yml Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
routes.rb Merge commit '598ae4f2da86029b1c3c3e35e64b89873037b598' into glitch-soc/merge-upstream 2024-07-30 20:47:34 +02:00
settings.yml Merge branch 'refs/heads/glitch-soc' into develop 2024-05-11 23:31:31 +02:00
sidekiq.yml Merge branch 'glitch-soc' into develop 2024-02-24 11:11:24 +01:00
storage.yml Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
webpacker.yml Merge commit '3f6887557b23d363e7f8f18518db4447739d64bb' into glitch-soc/merge-upstream 2024-05-04 14:59:00 +02:00