Claire 9a3d91f629 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/concerns/domain_materializable.rb`: Fixed a code style issue upstream in a PR that got merged in glitch-soc earlier. Changed the code to match upstream's.		2022-12-07 09:03:42 +01:00
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
initializers	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-28 11:33:34 +01:00
locales	New Crowdin updates (#21599)	2022-12-02 23:03:06 +09:00
locales-glitch	Remove glitch-soc-specific translations of upstreamed feature (domain block import)	2022-11-17 12:08:59 +01:00
webpack	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-28 11:31:00 +02:00
application.rb	enable be locale (#22022)	2022-12-07 00:00:56 +01:00
boot.rb
brakeman.ignore
database.yml	Change postgres connection timeout (#21790)	2022-12-07 00:39:36 +01:00
deploy.rb	Change master branch to main branch (#20290)	2022-11-10 04:02:05 +01:00
environment.rb
i18n-tasks.yml	Revert "Revert "Change "Allow trends without prior review" setting to include statuses (#17977)""	2022-11-12 10:17:22 +01:00
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
pghero.yml
puma.rb
roles.yml	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
routes.rb	Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)	2022-11-17 11:05:09 +01:00
secrets.yml
settings.yml	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
sidekiq.yml	Change incoming activity processing to happen in ingress queue (#20264)	2022-11-10 14:21:51 +01:00
storage.yml
webpacker.yml