Claire 93912f0498 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Conflict because we (glitch-soc) have disabled trending of posts without review. Discarded that upstream change. - `app/views/admin/settings/discovery/show.html.haml`: Just an extra setting in glitch-soc. Kept that extra setting.		2022-11-12 13:28:03 +01:00
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-12 13:28:03 +01:00
initializers	Add “Glitch-only” label to glitch-specific settings	2022-11-12 11:30:35 +01:00
locales	Revert "Revert "Change "Allow trends without prior review" setting to include statuses (#17977)""	2022-11-12 10:17:22 +01:00
locales-glitch	Add back missing glitch-soc admin settings (#1919)	2022-11-12 13:24:53 +01:00
webpack
application.rb	Fix mailers queue not being used for mailers (#20274)	2022-11-10 02:31:09 +01:00
boot.rb
brakeman.ignore
database.yml
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-10-28 19:23:58 +02:00
pghero.yml
puma.rb
roles.yml
routes.rb	Add back missing glitch-soc admin settings (#1919)	2022-11-12 13:24:53 +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