Claire 2d09653d50 Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb: Upstream added an `include` where we had an extra `include` due to glitch-soc's theming system. Added upstream's new `include`.		2023-07-13 13:35:15 +02:00
..
environments	Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream	2023-07-13 13:35:15 +02:00
imagemagick	Merge pull request from GHSA-9928-3cp5-93fm	2023-07-06 15:05:05 +02:00
initializers	Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream	2023-07-13 13:35:15 +02:00
locales	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
locales-glitch	Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream	2023-06-18 13:41:33 +02:00
routes	Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream	2023-07-12 15:44:33 +02:00
webpack	Switch to using a `common` runtime chunk rather than `locales`	2023-06-10 17:43:13 +02:00
application.rb	Rails 7.0 update (#25668)	2023-07-13 09:36:07 +02:00
boot.rb	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
brakeman.ignore	Refactor `Trends::Query` to avoid brakeman sql injection warnings (#25881)	2023-07-12 14:19:20 +02:00
database.yml	First pass at multi-database for read replica using Rails native adapter (#25693)	2023-07-08 19:45:36 +02:00
deploy.rb	Fix Performance/CollectionLiteralInLoop cop (#24819)	2023-05-04 05:33:55 +02: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 '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream	2023-07-12 15:38:35 +02:00
navigation.rb	Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream	2023-06-18 13:41:33 +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 'main' into glitch-soc/merge-upstream	2023-07-05 12:01:26 +02:00
secrets.yml	…
settings.yml	Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream	2023-05-25 22:49:18 +02:00
sidekiq.yml	…
storage.yml	…
webpacker.yml	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-03 17:40:59 +02:00