Claire 941a9df28a Merge commit '96bcee66fb' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-nightly.yml`: Upstream changed how the nightly builds are versioned, the conflict is because glitch-soc modified adjacent lines relative to the docker repositories the images are pushed to. Applied upstream's changes. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream moved some settings around. Glitch-soc had more settings. Applied upstream's changes, moving glitch-soc's extra settings accordingly.		2023-08-24 21:56:00 +02:00
..
environments	Merge commit '0d7340380c' into glitch-soc/merge-upstream	2023-07-13 13:35:15 +02:00
imagemagick	Fix AVIF attachments (#26264)	2023-08-01 19:34:11 +02:00
initializers	Merge commit '1cb978bcc3' into glitch-soc/merge-upstream	2023-08-22 18:50:14 +02:00
locales	Change admin e-mail notification settins to be their own settings group (#26596)	2023-08-24 14:43:00 +02:00
locales-glitch	Move glitch-soc's “Hide followers count” setting to “Show followers count” under “Privacy and reach” tab	2023-08-22 19:50:37 +02:00
routes	Merge commit 'facfec1ba3' into glitch-soc/merge-upstream	2023-08-24 21:03:56 +02:00
webpack	Merge commit 'dc09c10fa8' into glitch-soc/merge-upstream	2023-08-24 21:26:27 +02:00
application.rb	Allow setting a custom HTTP method in CacheBuster (#26528)	2023-08-18 08:18:40 +02:00
boot.rb	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
brakeman.ignore	Ignore the brakeman PermitAttributes check (#25915)	2023-07-28 23:17:53 +02:00
brakeman.yml	Ignore the brakeman PermitAttributes check (#25915)	2023-07-28 23:17:53 +02:00
database.yml	Change DB_REPLICA_* environment variables to REPLICA_DB_* (#26386)	2023-08-08 13:59:40 +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 '44cd88adc4' into glitch-soc/merge-upstream	2023-06-10 12:38:33 +02:00
i18n-tasks.yml	Merge commit 'cfd50f30bb' into glitch-soc/merge-upstream	2023-07-30 14:33:28 +02:00
navigation.rb	Merge commit 'd9c21293aa' into glitch-soc/merge-upstream	2023-08-22 18:31:28 +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 '3554c52795' into glitch-soc/merge-upstream	2023-07-30 16:11:55 +02:00
secrets.yml
settings.yml	Merge commit 'bec6a1cad4' into glitch-soc/merge-upstream	2023-05-25 22:49:18 +02:00
sidekiq.yml	Change indexing frequency from 5 minutes to 1 minute, add locks to schedulers (#26304)	2023-08-03 11:04:05 +02:00
storage.yml	Update Mastodon to Rails 6.1 (#15910)	2021-03-24 10:44:31 +01:00
webpacker.yml	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-03 17:40:59 +02:00