Claire 395b9011ee Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, just upstream adding a method textually adjacent to glitch-soc only code. Ported upstream's change.		2024-06-17 18:30:28 +02:00
..
environments	Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream	2024-06-17 18:30:28 +02:00
imagemagick	Ensure custom favicon is converted to PNG and ICO (#30208)	2024-05-07 18:15:17 +00:00
initializers	Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream	2024-06-17 18:30:28 +02:00
locales	New Crowdin Translations (automated) (#30723)	2024-06-17 12:13:23 +00:00
locales-glitch	Fix bogus translations	2024-06-08 13:28:41 +02:00
routes	Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream	2024-06-06 12:27:26 +02:00
templates	Move privacy policy into markdown file (#28699)	2024-01-19 11:22:23 +00:00
webpack	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
application.rb	Add expired/revoked scopes for doorkeeper models via extension modules (#29936)	2024-06-11 08:50:51 +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	…
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	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
roles.yml	…
routes.rb	Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream	2024-05-06 17:53:51 +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